add File::open and File::close in FileSystem plugin

[simgrid.git] / src / plugins / link_energy.cpp

diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp
index 97aeb01..37366fe 100644 (file)
--- a/src/plugins/link_energy.cpp
+++ b/src/plugins/link_energy.cpp
@@ -7,10 +7,9 @@
 #include "simgrid/host.h"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/simix.hpp"
-#include "src/surf/network_interface.hpp"
+#include "simgrid/s4u/Link.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -60,7 +59,7 @@ class LinkEnergy {
 public:
   static xbt::Extension<simgrid::s4u::Link, LinkEnergy> EXTENSION_ID;
 
-  explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(surf_get_clock()) {}
+  explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(simgrid::s4u::Engine::get_clock()) {}
 
   void init_watts_range_list();
   double get_consumed_energy();
@@ -71,11 +70,11 @@ xbt::Extension<s4u::Link, LinkEnergy> LinkEnergy::EXTENSION_ID;
 
 void LinkEnergy::update()
 {
-  if (!inited_)
+  if (not inited_)
     init_watts_range_list();
 
   double power = get_power();
-  double now   = surf_get_clock();
+  double now   = simgrid::s4u::Engine::get_clock();
   total_energy_ += power * (now - last_updated_);
   last_updated_ = now;
 }
@@ -125,7 +124,7 @@ void LinkEnergy::init_watts_range_list()
 
 double LinkEnergy::get_power() const
 {
-  if (!inited_)
+  if (not inited_)
     return 0.0;
 
   double power_slope = busy_ - idle_;
@@ -138,7 +137,7 @@ double LinkEnergy::get_power() const
 
 double LinkEnergy::get_consumed_energy()
 {
-  if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment
+  if (last_updated_ < simgrid::s4u::Engine::get_clock()) // We need to simcall this as it modifies the environment
     kernel::actor::simcall(std::bind(&LinkEnergy::update, this));
   return this->total_energy_;
 }
@@ -148,20 +147,6 @@ double LinkEnergy::get_consumed_energy()
 using simgrid::plugin::LinkEnergy;
 
 /* **************************** events  callback *************************** */
-static void on_communicate(const simgrid::kernel::resource::NetworkAction& action)
-{
-  XBT_DEBUG("onCommunicate is called");
-  for (auto const* link : action.get_links()) {
-    if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI)
-      continue;
-
-    XBT_DEBUG("Update link %s", link->get_cname());
-    auto* link_energy = link->get_iface()->extension<LinkEnergy>();
-    link_energy->init_watts_range_list();
-    link_energy->update();
-  }
-}
-
 static void on_simulation_end()
 {
   std::vector<simgrid::s4u::Link*> links = simgrid::s4u::Engine::get_instance()->get_all_links();
@@ -177,6 +162,16 @@ static void on_simulation_end()
 
   XBT_INFO("Total energy over all links: %f", total_energy);
 }
+
+static void on_communication(const simgrid::kernel::activity::CommImpl& comm)
+{
+  for (auto const* link : comm.get_traversed_links()) {
+    if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) {
+      XBT_DEBUG("Update %s on Comm Start/End", link->get_cname());
+      link->extension<LinkEnergy>()->update();
+    }
+  }
+}
 /* **************************** Public interface *************************** */
 
 int sg_link_energy_is_inited()
@@ -216,16 +211,9 @@ void sg_link_energy_plugin_init()
                link.extension<LinkEnergy>()->get_consumed_energy());
   });
 
-  simgrid::s4u::Link::on_communication_state_change.connect(
-      [](simgrid::kernel::resource::NetworkAction const& action,
-         simgrid::kernel::resource::Action::State /* previous */) {
-        for (auto const* link : action.get_links()) {
-          if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI)
-            link->get_iface()->extension<LinkEnergy>()->update();
-        }
-      });
+  simgrid::kernel::activity::CommImpl::on_start.connect(&on_communication);
+  simgrid::kernel::activity::CommImpl::on_completion.connect(&on_communication);
 
-  simgrid::s4u::Link::on_communicate.connect(&on_communicate);
   simgrid::s4u::Engine::on_simulation_end.connect(&on_simulation_end);
 }