X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddf68f4576a823d181a8f030a93162d63cdab4c6..9a1d240905662db2c6e462c25315b5187b446538:/src/surf/plugins/energy.cpp

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 45ba1866ae..1cfbf5e184 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -5,10 +5,9 @@
 
 #include "simgrid/plugins/energy.h"
 #include "simgrid/simix.hpp"
-#include "src/surf/plugins/energy.hpp"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/virtual_machine.hpp"
-
+#include "src/surf/plugins/energy.hpp"
 #include <utility>
 
 /** @addtogroup SURF_plugin_energy
@@ -65,19 +64,18 @@ simgrid::xbt::Extension<simgrid::s4u::Host, HostEnergy> HostEnergy::EXTENSION_ID
 /* Computes the consumption so far.  Called lazily on need. */
 void HostEnergy::update()
 {
-  simgrid::surf::HostImpl* surf_host = host->extension<simgrid::surf::HostImpl>();
   double start_time = this->last_updated;
   double finish_time = surf_get_clock();
   double cpu_load;
-  if (surf_host->cpu_->getPstateSpeedCurrent() <= 0)
+  if (host->pimpl_cpu->getPstateSpeedCurrent() <= 0)
     // Some users declare a pstate of speed 0 flops (e.g., to model boot time).
     // We consider that the machine is then fully loaded. That's arbitrary but it avoids a NaN
     cpu_load = 1;
   else
-    cpu_load = lmm_constraint_get_usage(surf_host->cpu_->getConstraint()) / surf_host->cpu_->getPstateSpeedCurrent();
+    cpu_load = lmm_constraint_get_usage(host->pimpl_cpu->getConstraint()) / host->pimpl_cpu->getPstateSpeedCurrent();
 
   /** Divide by the number of cores here **/
-  cpu_load /= surf_host->cpu_->getCoreCount();
+  cpu_load /= host->pimpl_cpu->coreCount();
 
   if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not more
     cpu_load = 1;
@@ -103,8 +101,9 @@ void HostEnergy::update()
   this->total_energy = previous_energy + energy_this_step;
   this->last_updated = finish_time;
 
-  XBT_DEBUG("[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J",
-      surf_host->getName(), start_time, finish_time, surf_host->cpu_->speed_.peak, previous_energy, energy_this_step);
+  XBT_DEBUG(
+      "[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J",
+      host->name().c_str(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step);
 }
 
 HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock())
@@ -165,13 +164,14 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
      * (maxCpuLoad is by definition 1)
      */
     double power_slope;
-    int coreCount = host->coresCount();
+    int coreCount = host->coreCount();
+    double coreReciprocal = static_cast<double>(1) / static_cast<double>(coreCount);
     if (coreCount > 1)
-      power_slope = (max_power - min_power) / (1 - 1 / coreCount);
+      power_slope = (max_power - min_power) / (1 - coreReciprocal);
     else
       power_slope = 0; // Should be 0, since max_power == min_power (in this case)
 
-    current_power = min_power + (cpu_load - (1 / coreCount)) * power_slope;
+    current_power = min_power + (cpu_load - coreReciprocal) * power_slope;
   }
   else { /* Our machine is idle, take the dedicated value! */
     current_power = range.idle;
@@ -233,8 +233,7 @@ void HostEnergy::initWattsRangeList()
 
 /* **************************** events  callback *************************** */
 static void onCreation(simgrid::s4u::Host& host) {
-  simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
-  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // Ignore virtual machines
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
     return;
   host.extension_set(new HostEnergy(&host));
 }
@@ -245,10 +244,10 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf:
     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);
+    simgrid::surf::HostImpl* host     = sghost->pimpl_;
+    simgrid::s4u::VirtualMachine* vm  = dynamic_cast<simgrid::s4u::VirtualMachine*>(sghost);
     if (vm) // If it's a VM, take the corresponding PM
-      host = vm->getPm()->extension<simgrid::surf::HostImpl>();
+      host = vm->pimpl_vm_->getPm()->pimpl_;
 
     HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
 
@@ -258,8 +257,7 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf:
 }
 
 static void onHostStateChange(simgrid::s4u::Host &host) {
-  simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
-  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // Ignore virtual machines
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
     return;
 
   HostEnergy *host_energy = host.extension<HostEnergy>();
@@ -270,8 +268,7 @@ static void onHostStateChange(simgrid::s4u::Host &host) {
 
 static void onHostDestruction(simgrid::s4u::Host& host) {
   // Ignore virtual machines
-  simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
-  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host))
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();