[ENERGY] Change behavior on 1-core machines

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

diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp
index 9190065..ec14e75 100644 (file)
--- a/src/plugins/host_energy.cpp
+++ b/src/plugins/host_energy.cpp
@@ -5,6 +5,7 @@
 
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
 #include "src/include/surf/surf.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
@@ -350,13 +351,13 @@ void HostEnergy::init_watts_range_list()
         // In this case, 1core == AllCores
         current_power_values.push_back(current_power_values.at(1));
       } else { // size == 3
-        current_power_values[2] = current_power_values.at(1);
-        static thread_local bool displayed_warning = false; 
+        current_power_values[1] = current_power_values.at(2);
+        current_power_values[2] = current_power_values.at(2);
+        static bool displayed_warning = false;
         if (not displayed_warning) { // Otherwise we get in the worst case no_pstate*no_hosts warnings
           XBT_WARN("Host %s is a single-core machine and part of the power profile is '%s'"
                    ", which is in the 'Idle:OneCore:AllCores' format."
-                   " Since this is a single-core machine, AllCores and OneCore are identical."
-                   " Here, only the value for 'OneCore' is used.", host_->get_cname(), current_power_values_str.c_str());
+                   " Here, only the value for 'AllCores' is used.", host_->get_cname(), current_power_values_str.c_str());
           displayed_warning = true;
         }
       }
@@ -478,6 +479,21 @@ void sg_host_energy_plugin_init()
   simgrid::s4u::Host::on_destruction.connect(&on_host_destruction);
   simgrid::s4u::on_simulation_end.connect(&on_simulation_end);
   simgrid::surf::CpuAction::on_state_change.connect(&on_action_state_change);
+  // We may only have one actor on a node. If that actor executes something like
+  //   compute -> recv -> compute
+  // the recv operation will not trigger a "CpuAction::on_state_change". This means
+  // that the next trigger would be the 2nd compute, hence ignoring the idle time
+  // during the recv call. By updating at the beginning of a compute, we can
+  // fix that. (If the cpu is not idle, this is not required.)
+  simgrid::kernel::activity::ExecImpl::on_creation.connect([](simgrid::kernel::activity::ExecImplPtr activity){
+    if (activity->host_ != nullptr) { // We only run on one host
+      simgrid::s4u::Host* host = activity->host_;
+      if (dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_))
+        host = dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_)->get_pm();
+
+      host->extension<HostEnergy>()->update();
+    }
+  });
 }
 
 /** @ingroup plugin_energy