X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..e526ad06508e0193155f0591b43d7d9e9e92f6c7:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 61e00b91fd..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); @@ -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; } @@ -134,7 +134,7 @@ double surf_solve(double max_date) } simgrid::s4u::onTimeAdvance(time_delta); - TRACE_paje_dump_buffer (0); + TRACE_paje_dump_buffer(false); return time_delta; }