From 83af845233bb0fcf4550feddaed1bc97652137c6 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 10 Jan 2017 21:26:48 +0100
Subject: [PATCH] cosmetics

---
 src/surf/plugins/energy.cpp | 44 +++++++++++++++++--------------------
 src/xbt/xbt_str.cpp         |  4 ++--
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index b1b51c9c54..26d723ff38 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -85,7 +85,7 @@ void HostEnergy::update()
    *
    *   X/(X+Y)*W_idle + Y/(X+Y)*W_burn
    *
-   * where X is the amount of ideling cores, and Y the amount of computing cores.
+   * where X is the amount of idling cores, and Y the amount of computing cores.
    */
 
   double previous_energy = this->total_energy;
@@ -110,16 +110,13 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_g
 {
   initWattsRangeList();
 
-  if (host->properties() != nullptr) {
-    char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off");
-    if (off_power_str != nullptr) {
-      char* msg = bprintf("Invalid value for property watt_off of host %s: %%s", host->cname());
-      watts_off = xbt_str_parse_double(off_power_str, msg);
-      xbt_free(msg);
-    }
-    else
-      watts_off = 0;
+  const char* off_power_str = host->property("watt_off");
+  if (off_power_str != nullptr) {
+    char* msg       = bprintf("Invalid value for property watt_off of host %s: %%s", host->cname());
+    this->watts_off = xbt_str_parse_double(off_power_str, msg);
+    xbt_free(msg);
   }
+  /* watts_off is 0 by default */
 }
 
 HostEnergy::~HostEnergy()=default;
@@ -193,9 +190,7 @@ double HostEnergy::getConsumedEnergy()
 
 void HostEnergy::initWattsRangeList()
 {
-  if (host->properties() == nullptr)
-    return;
-  char* all_power_values_str = static_cast<char*>(xbt_dict_get_or_null(host->properties(), "watt_per_state"));
+  const char* all_power_values_str = host->property("watt_per_state");
   if (all_power_values_str == nullptr)
     return;
 
@@ -240,19 +235,20 @@ static void onCreation(simgrid::s4u::Host& host) {
 }
 
 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)
+  for (simgrid::surf::Cpu* cpu : action->cpus()) {
+    simgrid::s4u::Host* host = cpu->getHost();
+    if (host == nullptr)
       continue;
-    simgrid::surf::HostImpl* host     = sghost->pimpl_;
-    simgrid::s4u::VirtualMachine* vm  = dynamic_cast<simgrid::s4u::VirtualMachine*>(sghost);
+
+    // If it's a VM, take the corresponding PM
+    simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(host);
     if (vm) // If it's a VM, take the corresponding PM
-      host = vm->pimpl_vm_->getPm()->pimpl_;
+      host = vm->pimpl_vm_->getPm();
 
-    HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
+    // Get the host_energy extension for the relevant host
+    HostEnergy* host_energy = host->extension<HostEnergy>();
 
-    if(host_energy->last_updated < surf_get_clock())
+    if (host_energy->last_updated < surf_get_clock())
       host_energy->update();
   }
 }
@@ -268,9 +264,9 @@ static void onHostStateChange(simgrid::s4u::Host &host) {
 }
 
 static void onHostDestruction(simgrid::s4u::Host& host) {
-  // Ignore virtual machines
-  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
     return;
+
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();
   XBT_INFO("Total energy of host %s: %f Joules", host.cname(), host_energy->getConsumedEnergy());
diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index b1f9a38cfb..523ec91eab 100644
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -227,7 +227,7 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep)
 
 /**
  * \brief This functions splits a string after using another string as separator
- * For example A!!B!!C splitted after !! will return the dynar {A,B,C}
+ * For example A!!B!!C split after !! will return the dynar {A,B,C}
  * \return An array of dynars containing the string tokens
  */
 xbt_dynar_t xbt_str_split_str(const char *s, const char *sep)
@@ -251,7 +251,7 @@ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep)
   while (!done) {
     char *to_push;
     int v = 0;
-    //get the start of the first occurence of the substring
+    // get the start of the first occurrence of the substring
     q = strstr(p, sep);
     //if substring was not found add the entire string
     if (nullptr == q) {
-- 
2.20.1