X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fe0084ca00174771ea233fecb0d82bd6b2350eb..5f9b6053027484ea411db0d1ee44ac258c9816f1:/src/surf/plugins/host_dvfs.cpp

diff --git a/src/surf/plugins/host_dvfs.cpp b/src/surf/plugins/host_dvfs.cpp
index 7aa225fcd8..555d67ae53 100644
--- 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>
@@ -119,12 +118,12 @@ public:
   std::string getName() override { return "OnDemand"; }
   void update() override
   {
-    double load = sg_host_get_current_load(host);
+    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)
        *
@@ -134,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);
     }
   }
 };
@@ -164,8 +165,9 @@ public:
   virtual std::string getName() override { return "Conservative"; }
   virtual void update() override
   {
-    double load = sg_host_get_current_load(host)*host->getCoreCount();
+    double load = host->getCoreCount() * sg_host_get_avg_load(host);
     int pstate  = host->getPstate();
+    sg_host_load_reset(host); // Only consider the period between two calls to this method!
 
     if (load > freq_up_threshold) {
       if (pstate != 0) {