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
also change the namespace of kernel/resource/{Action,Model}
[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 98b5dd9c1d0728ccdbc9ee67ac8c9a1af0a767cb..659be87a7790d243af8ee35cc3d9933b0e6ca614 100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-150,28
+150,31
@@
double surf_solve(double max_date)
/*********
* MODEL *
*********/
/*********
* MODEL *
*********/
-static s
urf_action_t ActionListExtract(simgrid::surf
::ActionList* list)
+static s
imgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::resource
::ActionList* list)
{
if (list->empty())
return nullptr;
{
if (list->empty())
return nullptr;
- s
urf_action_t
res = &list->front();
+ s
imgrid::kernel::resource::Action*
res = &list->front();
list->pop_front();
return res;
}
list->pop_front();
return res;
}
-s
urf_action_t surf_model_extract_done_action_set(surf_model_t
model)
+s
imgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model*
model)
{
return ActionListExtract(model->getDoneActionSet());
}
{
return ActionListExtract(model->getDoneActionSet());
}
-surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
+simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model)
+{
return ActionListExtract(model->getFailedActionSet());
}
return ActionListExtract(model->getFailedActionSet());
}
-int surf_model_running_action_set_size(surf_model_t model){
+int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model)
+{
return model->getRunningActionSet()->size();
}
return model->getRunningActionSet()->size();
}
-void surf_cpu_action_set_bound(surf_action_t action, double bound) {
+void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound)
+{
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}