X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/666a812d1b3ee4568f2beb317dfcd08d99055697..e83a6a62aac54e3477bd15c64f243cfa23b3add3:/src/surf/plugins/link_energy.cpp

diff --git a/src/surf/plugins/link_energy.cpp b/src/surf/plugins/link_energy.cpp
index e7eb0c64bb..3f28eb864e 100644
--- a/src/surf/plugins/link_energy.cpp
+++ b/src/surf/plugins/link_energy.cpp
@@ -88,7 +88,7 @@ void LinkEnergy::initWattsRangeList()
     return;
   inited_ = true;
 
-  const char* all_power_values_str = this->link_->getProperty("watt_range");
+  const char* all_power_values_str = this->link_->get_property("watt_range");
 
   if (all_power_values_str == nullptr)
     return;
@@ -126,7 +126,7 @@ double LinkEnergy::getPower()
 
   double power_slope = busy_ - idle_;
 
-  double normalized_link_usage = link_->getUsage() / link_->bandwidth();
+  double normalized_link_usage = link_->get_usage() / link_->get_bandwidth();
   double dynamic_power         = power_slope * normalized_link_usage;
 
   return idle_ + dynamic_power;
@@ -135,7 +135,7 @@ double LinkEnergy::getPower()
 double LinkEnergy::getConsumedEnergy()
 {
   if (lastUpdated_ < surf_get_clock()) // We need to simcall this as it modifies the environment
-    simgrid::simix::kernelImmediate(std::bind(&LinkEnergy::update, this));
+    simgrid::simix::simcall(std::bind(&LinkEnergy::update, this));
   return this->totalEnergy_;
 }
 }
@@ -192,29 +192,25 @@ void sg_link_energy_plugin_init()
 
   xbt_assert(sg_host_count() == 0, "Please call sg_link_energy_plugin_init() before initializing the platform.");
 
-  simgrid::s4u::Link::onCreation.connect([](simgrid::s4u::Link& link) {
-    link.extension_set(new LinkEnergy(&link));
-  });
+  simgrid::s4u::Link::on_creation.connect([](simgrid::s4u::Link& link) { link.extension_set(new LinkEnergy(&link)); });
 
-  simgrid::s4u::Link::onStateChange.connect([](simgrid::s4u::Link& link) {
-    link.extension<LinkEnergy>()->update();
-  });
+  simgrid::s4u::Link::on_state_change.connect([](simgrid::s4u::Link& link) { link.extension<LinkEnergy>()->update(); });
 
-  simgrid::s4u::Link::onDestruction.connect([](simgrid::s4u::Link& link) {
+  simgrid::s4u::Link::on_destruction.connect([](simgrid::s4u::Link& link) {
     if (strcmp(link.get_cname(), "__loopback__"))
       XBT_INFO("Energy consumption of link '%s': %f Joules", link.get_cname(),
                link.extension<LinkEnergy>()->getConsumedEnergy());
   });
 
-  simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::kernel::resource::NetworkAction* action) {
+  simgrid::s4u::Link::on_communication_state_change.connect([](simgrid::kernel::resource::NetworkAction* action) {
     for (simgrid::kernel::resource::LinkImpl* link : action->links()) {
       if (link != nullptr)
         link->piface_.extension<LinkEnergy>()->update();
     }
   });
 
-  simgrid::s4u::Link::onCommunicate.connect(&onCommunicate);
-  simgrid::s4u::onSimulationEnd.connect(&onSimulationEnd);
+  simgrid::s4u::Link::on_communicate.connect(&onCommunicate);
+  simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);
 }
 
 /** @ingroup plugin_energy