X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/390af2c5e4f9783762fadc35bd0f3cac32961827..dd89cc2577e61b4b86b1ae7bc58dfa2ad00747e6:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index d459a4d80b..e57f843575 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Engine.hpp" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -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() || (watched_hosts.find(resource->cname()) != watched_hosts.end())) { + if (resource->isUsed() || (watched_hosts.find(resource->getCname()) != 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); } @@ -109,7 +109,7 @@ double surf_solve(double max_date) NOW = next_event_date; /* update state of the corresponding resource to the new value. Does not touch lmm. It will be modified if needed when updating actions */ - XBT_DEBUG("Calling update_resource_state for resource %s", resource->cname()); + XBT_DEBUG("Calling update_resource_state for resource %s", resource->getCname()); resource->apply_event(event, value); NOW = round_start; } @@ -129,12 +129,12 @@ 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); - TRACE_paje_dump_buffer (0); + TRACE_paje_dump_buffer(false); return time_delta; }