A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove useless length modifier 'l' in %l[efg] for printf.
[simgrid.git]
/
src
/
surf
/
surf_c_bindings.cpp
diff --git
a/src/surf/surf_c_bindings.cpp
b/src/surf/surf_c_bindings.cpp
index
f085ec9
..
1bcc47f
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "surf_interface.hpp"
#include "workstation_interface.hpp"
#include "vm_workstation_interface.hpp"
#include "surf_interface.hpp"
#include "workstation_interface.hpp"
#include "vm_workstation_interface.hpp"
@@
-25,7
+31,7
@@
static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){
}
char *surf_routing_edge_name(sg_routing_edge_t edge){
}
char *surf_routing_edge_name(sg_routing_edge_t edge){
- return edge->
p_name
;
+ return edge->
getName()
;
}
#ifdef CONTEXT_THREADS
}
#ifdef CONTEXT_THREADS
@@
-129,7
+135,7
@@
double surf_solve(double max_date)
next_event_date = tmgr_history_next_date(history);
next_event_date = tmgr_history_next_date(history);
- if(!strcmp(surf_network_model->getName(), "network NS3")){
//FIXME: add surf_network_model->m_name &&
+ if(!strcmp(surf_network_model->getName(), "network NS3")){
if(next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
if(next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
@@
-165,7
+171,7
@@
double surf_solve(double max_date)
}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
- XBT_DEBUG("Calling update_resource_state for resource %s with min %
l
f",
+ XBT_DEBUG("Calling update_resource_state for resource %s with min %f",
resource->getName(), surf_min);
resource->updateState(event, value, next_event_date);
}
resource->getName(), surf_min);
resource->updateState(event, value, next_event_date);
}
@@
-230,6
+236,7
@@
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
model->getDoneActionSet()->pop_front();
return res;
}
model->getDoneActionSet()->pop_front();
return res;
}
+
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
if (model->getFailedActionSet()->empty())
return NULL;
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
if (model->getFailedActionSet()->empty())
return NULL;
@@
-237,6
+244,7
@@
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
model->getFailedActionSet()->pop_front();
return res;
}
model->getFailedActionSet()->pop_front();
return res;
}
+
surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
if (model->getReadyActionSet()->empty())
return NULL;
surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
if (model->getReadyActionSet()->empty())
return NULL;
@@
-244,6
+252,7
@@
surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
model->getReadyActionSet()->pop_front();
return res;
}
model->getReadyActionSet()->pop_front();
return res;
}
+
surf_action_t surf_model_extract_running_action_set(surf_model_t model){
if (model->getRunningActionSet()->empty())
return NULL;
surf_action_t surf_model_extract_running_action_set(surf_model_t model){
if (model->getRunningActionSet()->empty())
return NULL;
@@
-520,7
+529,7
@@
e_surf_action_state_t surf_action_get_state(surf_action_t action){
return action->getState();
}
return action->getState();
}
-
int
surf_action_get_cost(surf_action_t action){
+
double
surf_action_get_cost(surf_action_t action){
return action->getCost();
}
return action->getCost();
}
@@
-532,6
+541,12
@@
void surf_cpu_action_set_bound(surf_action_t action, double bound) {
static_cast<CpuActionPtr>(action)->setBound(bound);
}
static_cast<CpuActionPtr>(action)->setBound(bound);
}
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+double surf_network_action_get_latency_limited(surf_action_t action) {
+ return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+}
+#endif
+
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;
}
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;
}
@@
-539,5
+554,3
@@
surf_file_t surf_storage_action_get_file(surf_action_t action){
xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_lsDict;
}
xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_lsDict;
}
-
-