Use C++ style casts.

[simgrid.git] / src / surf / plugins / host_dvfs.cpp

diff --git a/src/surf/plugins/host_dvfs.cpp b/src/surf/plugins/host_dvfs.cpp
index c21f839..1f11563 100644 (file)
--- a/src/surf/plugins/host_dvfs.cpp
+++ b/src/surf/plugins/host_dvfs.cpp
@@ -12,7 +12,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <simgrid/msg.h>
 #include <simgrid/s4u/Engine.hpp>
 #include <string>
 #include <utility>
@@ -122,10 +121,9 @@ public:
     double load = host->getCoreCount() * sg_host_get_avg_load(host);
     sg_host_load_reset(host); // Only consider the period between two calls to this method!
 
-    // FIXME I don't like that we multiply with the getCoreCount() just here...
-    if (load*host->getCoreCount() > freq_up_threshold) {
+    if (load > freq_up_threshold) {
       host->setPstate(0); /* Run at max. performance! */
-      XBT_INFO("Load: %f > threshold: %f --> changed to pstate %i", load * host->getCoreCount(), freq_up_threshold, 0);
+      XBT_INFO("Load: %f > threshold: %f --> changed to pstate %i", load, freq_up_threshold, 0);
     } else {
       /* The actual implementation uses a formula here: (See Kernel file cpufreq_ondemand.c:158)
        *
@@ -135,10 +133,12 @@ public:
        * lowest_pstate - load*pstatesCount()
        */
       int max_pstate = host->getPstatesCount() - 1;
-      int new_pstate = max_pstate - load * max_pstate;
+      // Load is now < freq_up_threshold; exclude pstate 0 (the fastest)
+      // because pstate 0 can only be selected if load > freq_up_threshold
+      int new_pstate = max_pstate - load * (max_pstate + 1);
       host->setPstate(new_pstate);
 
-      XBT_DEBUG("Load: %f --> changed to pstate %i", load*host->getCoreCount(), new_pstate);
+      XBT_DEBUG("Load: %f < threshold: %f --> changed to pstate %i", load, freq_up_threshold, new_pstate);
     }
   }
 };
@@ -294,7 +294,6 @@ static void on_host_added(simgrid::s4u::Host& host)
 }
 
 /* **************************** Public interface *************************** */
-extern "C" {
 
 /** \ingroup SURF_plugin_load
  * \brief Initializes the HostDvfs plugin
@@ -315,4 +314,3 @@ void sg_host_dvfs_plugin_init()
   xbt_cfg_register_string(property_governor, "performance", nullptr,
                           "Which Governor should be used that adapts the CPU frequency?");
 }
-}