X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab2f258eb5e0f714e4219125e51c118d958bb66d..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 97e7964271..61e00b91fd 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -34,14 +34,13 @@ 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)
 {
   double time_delta = -1.0; /* duration */
-  double next_event_date = -1.0;
   double model_next_action_end = -1.0;
   double value = -1.0;
   simgrid::surf::Resource *resource = nullptr;
@@ -71,7 +70,7 @@ double surf_solve(double max_date)
   XBT_DEBUG("Looking for next trace event");
 
   while (1) { // Handle next occurring events until none remains
-    next_event_date = future_evt_set->next_date();
+    double next_event_date = future_evt_set->next_date();
     XBT_DEBUG("Next TRACE event: %f", next_event_date);
 
     if (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you
@@ -101,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);
       }
@@ -130,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);