Rename the S4U interface stored in internal objects as piface

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

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index c972873..c333364 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <utility>
-#include <vector>
 
 #include "simgrid/plugins/energy.h"
 #include "simgrid/simix.hpp"
@@ -102,11 +101,13 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) :
 {
   initWattsRangeList();
 
-  if (host->properties() != NULL) {
+  if (host->properties() != nullptr) {
     char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off");
-    if (off_power_str != NULL)
-      watts_off = xbt_str_parse_double(off_power_str,
-          bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str()));
+    if (off_power_str != nullptr) {
+      char *msg = bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str());
+      watts_off = xbt_str_parse_double(off_power_str, msg);
+      xbt_free(msg);
+    }
     else
       watts_off = 0;
   }
@@ -154,18 +155,18 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
 double HostEnergy::getConsumedEnergy()
 {
   if (last_updated < surf_get_clock()) // We need to simcall this as it modifies the environment
-    simgrid::simix::kernel(std::bind(&HostEnergy::update, this));
+    simgrid::simix::kernelImmediate(std::bind(&HostEnergy::update, this));
 
   return total_energy;
 }
 
 void HostEnergy::initWattsRangeList()
 {
-  if (host->properties() == NULL)
+  if (host->properties() == nullptr)
     return;
   char* all_power_values_str =
     (char*)xbt_dict_get_or_null(host->properties(), "watt_per_state");
-  if (all_power_values_str == NULL)
+  if (all_power_values_str == nullptr)
     return;
 
   xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ",");
@@ -182,12 +183,14 @@ void HostEnergy::initWattsRangeList()
 
     /* min_power corresponds to the idle power (cpu load = 0) */
     /* max_power is the power consumed at 100% cpu load       */
+    char *msg_min = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str());
+    char *msg_max = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str());
     power_range_watts_list.push_back(power_range(
-      xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*),
-          bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str())),
-      xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*),
-          bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str()))
+      xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), msg_min),
+      xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), msg_max)
     ));
+    xbt_free(msg_min);
+    xbt_free(msg_max);
 
     xbt_dynar_free(&current_power_values);
   }
@@ -205,17 +208,22 @@ static void onCreation(simgrid::s4u::Host& host) {
   host.extension_set(new HostEnergy(&host));
 }
 
-static void onActionStateChange(simgrid::surf::CpuAction *action, e_surf_action_state_t previous) {
-  const char *name = getActionCpu(action)->getName();
-  simgrid::surf::HostImpl *host = sg_host_by_name(name)->extension<simgrid::surf::HostImpl>();
-  simgrid::surf::VirtualMachine *vm = dynamic_cast<simgrid::surf::VirtualMachine*>(host);
-  if (vm) // If it's a VM, take the corresponding PM
-    host = vm->getPm()->extension<simgrid::surf::HostImpl>();
-
-  HostEnergy *host_energy = host->p_host->extension<HostEnergy>();
-
-  if(host_energy->last_updated < surf_get_clock())
-    host_energy->update();
+static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf::Action::State previous) {
+  for(simgrid::surf::Cpu* cpu : action->cpus()) {
+    const char *name = cpu->getName();
+    sg_host_t sghost = sg_host_by_name(name);
+    if(sghost == nullptr)
+      continue;
+    simgrid::surf::HostImpl *host = sghost->extension<simgrid::surf::HostImpl>();
+    simgrid::surf::VirtualMachine *vm = dynamic_cast<simgrid::surf::VirtualMachine*>(host);
+    if (vm) // If it's a VM, take the corresponding PM
+      host = vm->getPm()->extension<simgrid::surf::HostImpl>();
+
+    HostEnergy *host_energy = host->piface->extension<HostEnergy>();
+
+    if(host_energy->last_updated < surf_get_clock())
+      host_energy->update();
+  }
 }
 
 static void onHostStateChange(simgrid::s4u::Host &host) {