X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..611d822b02f836d7abe031cced6adc4281ef4356:/src/surf/plugins/link_energy.cpp diff --git a/src/surf/plugins/link_energy.cpp b/src/surf/plugins/link_energy.cpp index dbe5c8fe9b..062502b16d 100644 --- a/src/surf/plugins/link_energy.cpp +++ b/src/surf/plugins/link_energy.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, 2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -145,10 +145,11 @@ double LinkEnergy::getConsumedEnergy() using simgrid::plugin::LinkEnergy; /* **************************** events callback *************************** */ -static void onCommunicate(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src, simgrid::s4u::Host* dst) +static void onCommunicate(simgrid::kernel::resource::NetworkAction* action, simgrid::s4u::Host* src, + simgrid::s4u::Host* dst) { XBT_DEBUG("onCommunicate is called"); - for (simgrid::surf::LinkImpl* link : action->links()) { + for (simgrid::kernel::resource::LinkImpl* link : action->links()) { if (link == nullptr) continue; @@ -206,8 +207,8 @@ void sg_link_energy_plugin_init() link.extension()->getConsumedEnergy()); }); - simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::surf::NetworkAction* action) { - for (simgrid::surf::LinkImpl* link : action->links()) { + simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::kernel::resource::NetworkAction* action) { + for (simgrid::kernel::resource::LinkImpl* link : action->links()) { if (link != nullptr) link->piface_.extension()->update(); }