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 49b3558..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,9 +101,9 @@ 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) {
+    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);
@@ -156,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, ",");
@@ -213,14 +212,14 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf:
   for(simgrid::surf::Cpu* cpu : action->cpus()) {
     const char *name = cpu->getName();
     sg_host_t sghost = sg_host_by_name(name);
-    if(sghost == NULL)
+    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->p_host->extension<HostEnergy>();
+    HostEnergy *host_energy = host->piface->extension<HostEnergy>();
 
     if(host_energy->last_updated < surf_get_clock())
       host_energy->update();