X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/264c5991bbe2ec1c8f31a8ed68a83a8d1b656fa1..d810f007424f198fb087f9fc5ae17f70159ac928:/src/plugins/host_dvfs.cpp

diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index 0159926bda..f714b0f787 100644
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -221,9 +221,9 @@ public:
  *
  * > The CPUfreq governor "conservative", much like the "ondemand"
  * > governor, sets the CPU frequency depending on the current usage.  It
- * > differs in behaviour in that it gracefully increases and decreases the
+ * > differs in behavior in that it gracefully increases and decreases the
  * > CPU speed rather than jumping to max speed the moment there is any load
- * > on the CPU. This behaviour is more suitable in a battery powered
+ * > on the CPU. This behavior is more suitable in a battery powered
  * > environment.
  */
 class Conservative : public Governor {
@@ -232,9 +232,9 @@ class Conservative : public Governor {
 
 public:
   explicit Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {}
-  virtual std::string get_name() const override { return "Conservative"; }
+  std::string get_name() const override { return "Conservative"; }
 
-  virtual void update() override
+  void update() override
   {
     double load = get_host()->get_core_count() * sg_host_get_avg_load(get_host());
     int pstate  = get_host()->get_pstate();
@@ -293,19 +293,17 @@ public:
         task_id           = 0;
       }
     });
-    simgrid::kernel::activity::ExecImpl::on_creation.connect(
-        [this](simgrid::kernel::activity::ExecImpl const& activity) {
-          if (activity.get_host() == get_host())
-            pre_task();
-        });
-    simgrid::kernel::activity::ExecImpl::on_completion.connect(
-        [this](simgrid::kernel::activity::ExecImpl const& activity) {
-          // For more than one host (not yet supported), we can access the host via
-          // simcalls_.front()->issuer->iface()->get_host()
-          if (activity.get_host() == get_host() && iteration_running) {
-            comp_timer += activity.surf_action_->get_finish_time() - activity.surf_action_->get_start_time();
-          }
-        });
+    simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) {
+      if (activity.get_host() == get_host())
+        pre_task();
+    });
+    simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) {
+      // For more than one host (not yet supported), we can access the host via
+      // simcalls_.front()->issuer->iface()->get_host()
+      if (activity.get_host() == get_host() && iteration_running) {
+        comp_timer += activity.get_finish_time() - activity.get_start_time();
+      }
+    });
     // FIXME I think that this fires at the same time for all hosts, so when the src sends something,
     // the dst will be notified even though it didn't even arrive at the recv yet
     simgrid::s4u::Link::on_communicate.connect(
@@ -316,7 +314,7 @@ public:
         });
   }
 
-  virtual std::string get_name() const override { return "Adagio"; }
+  std::string get_name() const override { return "Adagio"; }
 
   void pre_task()
   {
@@ -357,7 +355,7 @@ public:
     task_id++;
   }
 
-  virtual void update() override {}
+  void update() override {}
 };
 #endif
 } // namespace dvfs