X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..fcd07352208c76c3cf050718dac314807eaa7105:/src/plugins/host_energy.cpp?ds=sidebyside diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index b01fc31772..ef191bfd51 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -110,7 +110,7 @@ before you can get accurate energy predictions. @endrst */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, "Logging specific to the SURF energy plugin"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host_energy, kernel, "Logging specific to the host energy plugin"); // Forwards declaration needed to make this function a friend (because friends have external linkage by default) static void on_simulation_end(); @@ -333,7 +333,7 @@ double HostEnergy::get_current_watts_value(double cpu_load) const double HostEnergy::get_consumed_energy() { if (last_updated_ < simgrid::s4u::Engine::get_clock()) // We need to simcall this as it modifies the environment - simgrid::kernel::actor::simcall(std::bind(&HostEnergy::update, this)); + simgrid::kernel::actor::simcall_answered(std::bind(&HostEnergy::update, this)); return total_energy_; } @@ -509,7 +509,7 @@ void sg_host_energy_plugin_init() */ void sg_host_energy_update_all() { - simgrid::kernel::actor::simcall([]() { + simgrid::kernel::actor::simcall_answered([]() { std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); for (auto const& host : list) if (dynamic_cast(host) == nullptr) { // Ignore virtual machines