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
plug memleak
[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
b99ded5
..
561dc5f
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-27,14
+27,12
@@
static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
extern double NOW;
extern double NOW;
-void surf_presolve(
void
)
+void surf_presolve()
{
double next_event_date = -1.0;
tmgr_trace_iterator_t event = nullptr;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
{
double next_event_date = -1.0;
tmgr_trace_iterator_t event = nullptr;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
- simgrid::surf::Model *model = nullptr;
- unsigned int iter;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
while ((next_event_date = future_evt_set->next_date()) != -1.0) {
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
while ((next_event_date = future_evt_set->next_date()) != -1.0) {
@@
-49,7
+47,7
@@
void surf_presolve(void)
}
XBT_DEBUG ("Set every models in the right state by updating them to 0.");
}
XBT_DEBUG ("Set every models in the right state by updating them to 0.");
-
xbt_dynar_foreach(all_existing_models, iter, model
)
+
for (auto model : *all_existing_models
)
model->updateActionsState(NOW, 0.0);
}
model->updateActionsState(NOW, 0.0);
}
@@
-60,9
+58,7
@@
double surf_solve(double max_date)
double model_next_action_end = -1.0;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
double model_next_action_end = -1.0;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
- simgrid::surf::Model *model = nullptr;
tmgr_trace_iterator_t event = nullptr;
tmgr_trace_iterator_t event = nullptr;
- unsigned int iter;
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
@@
-147,7
+143,7
@@
double surf_solve(double max_date)
NOW = NOW + time_delta;
// Inform the models of the date change
NOW = NOW + time_delta;
// Inform the models of the date change
-
xbt_dynar_foreach(all_existing_models, iter, model
) {
+
for (auto model : *all_existing_models
) {
model->updateActionsState(NOW, time_delta);
}
model->updateActionsState(NOW, time_delta);
}
@@
-266,10
+262,6
@@
void surf_vm_set_bound(sg_host_t vm, double bound){
get_casted_vm(vm)->setBound(bound);
}
get_casted_vm(vm)->setBound(bound);
}
-void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
- get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
-}
-
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
}