X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d33e7a563a884247bff85406dcc589a70a162e79..3e697d0a3c14acfc95f73f509af52d1872a85b0c:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 46f00dedd5..61e00b91fd 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -34,8 +34,8 @@ void surf_presolve() } XBT_DEBUG ("Set every models in the right state by updating them to 0."); - for (auto model : *all_existing_models) - model->updateActionsState(NOW, 0.0); + for (auto const& model : *all_existing_models) + model->updateActionsState(NOW, 0.0); } double surf_solve(double max_date) @@ -100,7 +100,7 @@ double surf_solve(double max_date) XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date); while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { - if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->cname())) { + if (resource->isUsed() || (watched_hosts.find(resource->cname()) != watched_hosts.end())) { time_delta = next_event_date - NOW; XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta); } @@ -129,7 +129,7 @@ double surf_solve(double max_date) NOW = NOW + time_delta; // Inform the models of the date change - for (auto model : *all_existing_models) { + for (auto const& model : *all_existing_models) { model->updateActionsState(NOW, time_delta); } simgrid::s4u::onTimeAdvance(time_delta);