X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e2f1b12f4459f77318e5d664317473e35aeb473..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/plugins/link_energy.cpp diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index d6ff7970f4..20c9873599 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -136,7 +136,7 @@ double LinkEnergy::get_power() double LinkEnergy::get_consumed_energy() { if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment - simgrid::simix::simcall(std::bind(&LinkEnergy::update, this)); + simgrid::kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); return this->total_energy_; } } // namespace plugin @@ -186,7 +186,6 @@ int sg_link_energy_is_inited() */ void sg_link_energy_plugin_init() { - if (LinkEnergy::EXTENSION_ID.valid()) return; LinkEnergy::EXTENSION_ID = simgrid::s4u::Link::extension_create(); @@ -213,7 +212,7 @@ void sg_link_energy_plugin_init() }); simgrid::s4u::Link::on_communicate.connect(&on_communicate); - simgrid::s4u::on_simulation_end.connect(&on_simulation_end); + simgrid::s4u::Engine::on_simulation_end.connect(&on_simulation_end); } /** @ingroup plugin_energy