X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70e4035847341b5ab8161e5e2611bb2f40c7050d..a73d204e173f35c0abb92b26e061929066b8b283:/src/plugins/host_dvfs.cpp

diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index 370582d4ab..86eecf1527 100644
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -26,23 +26,25 @@ static simgrid::config::Flag<double> cfg_sampling_rate("plugin/dvfs/sampling-rat
     [](double val){if (val != 0.1) sg_host_dvfs_plugin_init();});
 
 static simgrid::config::Flag<std::string> cfg_governor("plugin/dvfs/governor",
-    "Which Governor should be used that adapts the CPU frequency?", "performance",
+                                                       "Which Governor should be used that adapts the CPU frequency?",
+                                                       "performance",
 
-    std::map<std::string, std::string>({
+                                                       std::map<std::string, std::string>({
 #if HAVE_SMPI
-        {"adagio", "TODO: Doc"},
+                                                         {"adagio", "TODO: Doc"},
 #endif
-        {"conservative", "TODO: Doc"},
-        {"ondemand", "TODO: Doc"},
-        {"performance", "TODO: Doc"},
-        {"powersave", "TODO: Doc"},
-    }),
+                                                             {"conservative", "TODO: Doc"}, {"ondemand", "TODO: Doc"},
+                                                             {"performance", "TODO: Doc"}, {"powersave", "TODO: Doc"},
+                                                       }),
 
-    [](std::string val) { if (val != "performance") sg_host_dvfs_plugin_init(); });
+                                                       [](const std::string& val) {
+                                                         if (val != "performance")
+                                                           sg_host_dvfs_plugin_init();
+                                                       });
 
 static simgrid::config::Flag<int>
     cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"},
-                   "Which pstate is the minimum (and hence fastest) pstate for this governor?", 0, [](int) {});
+                   "Which pstate is the minimum (and hence fastest) pstate for this governor?", 0);
 
 static const int max_pstate_not_limited = -1;
 static simgrid::config::Flag<int>
@@ -276,36 +278,36 @@ public:
   explicit Adagio(simgrid::s4u::Host* ptr)
       : Governor(ptr), rates(100, std::vector<double>(ptr->get_pstate_count(), 0.0))
   {
-    simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::ActorPtr actor) {
+    simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::Actor const& actor) {
       // Every instance of this class subscribes to this event, so one per host
       // This means that for any actor, all 'hosts' are normally notified of these
       // changes, even those who don't currently run the actor 'proc_id'.
       // -> Let's check if this signal call is for us!
-      if (get_host() == actor->get_host()) {
+      if (get_host() == actor.get_host()) {
         iteration_running = true;
       }
     });
-    simgrid::smpi::plugin::ampi::on_iteration_out.connect([this](simgrid::s4u::ActorPtr actor) {
-      if (get_host() == actor->get_host()) {
+    simgrid::smpi::plugin::ampi::on_iteration_out.connect([this](simgrid::s4u::Actor const& actor) {
+      if (get_host() == actor.get_host()) {
         iteration_running = false;
         task_id           = 0;
       }
     });
-    simgrid::kernel::activity::ExecImpl::on_creation.connect([this](simgrid::kernel::activity::ExecImplPtr activity) {
-      if (activity->host_ == get_host())
+    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::kernel::activity::ExecImpl::on_completion.connect([this](simgrid::kernel::activity::ExecImplPtr activity) {
+    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->host_ == get_host() && iteration_running) {
-        comp_timer += activity->surf_action_->get_finish_time() - activity->surf_action_->get_start_time();
+      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(
-        [this](kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst) {
+        [this](kernel::resource::NetworkAction const&, s4u::Host* src, s4u::Host* dst) {
           if ((get_host() == src || get_host() == dst) && iteration_running) {
             post_task();
           }
@@ -332,9 +334,8 @@ public:
   {
     double computed_flops = sg_host_get_computed_flops(get_host()) - comp_counter;
     double target_time    = (simgrid::s4u::Engine::get_clock() - start_time);
-    target_time =
-        target_time *
-        static_cast<double>(99.0 / 100.0); // FIXME We account for t_copy arbitrarily with 1% -- this needs to be fixed
+    target_time           = target_time * 99.0 / 100.0; // FIXME We account for t_copy arbitrarily with 1%
+                                                        // -- this needs to be fixed
 
     bool is_initialized         = rates[task_id][best_pstate] != 0;
     rates[task_id][best_pstate] = computed_flops / comp_timer;
@@ -436,7 +437,7 @@ static void on_host_added(simgrid::s4u::Host& host)
 
 /* **************************** Public interface *************************** */
 
-/** @ingroup SURF_plugin_load
+/**
  * @brief Initializes the HostDvfs plugin
  * @details The HostDvfs plugin provides an API to get the current load of each host.
  */