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

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 3d7c8a8533..48c724f6dd 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -1,17 +1,16 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010, 2012-2016. The SimGrid Team. All rights reserved.    */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <utility>
-
 #include "simgrid/plugins/energy.h"
 #include "simgrid/simix.hpp"
 #include "src/surf/plugins/energy.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/virtual_machine.hpp"
 
+#include <utility>
+
 /** @addtogroup SURF_plugin_energy
 
 
@@ -66,7 +65,7 @@ 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>();
+  simgrid::surf::HostImpl* surf_host = host->pimpl_;
   double start_time = this->last_updated;
   double finish_time = surf_get_clock();
   double cpu_load;
@@ -78,7 +77,7 @@ void HostEnergy::update()
     cpu_load = lmm_constraint_get_usage(surf_host->cpu_->getConstraint()) / surf_host->cpu_->getPstateSpeedCurrent();
 
   /** Divide by the number of cores here **/
-  cpu_load /= surf_host->cpu_->getCoreCount();
+  cpu_load /= surf_host->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;
@@ -151,11 +150,29 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
   double max_power     = 0;
   double power_slope   = 0;
 
-  if (cpu_load != 0) { /* Something is going on, the machine is not idle */
+  if (cpu_load > 0) { /* Something is going on, the machine is not idle */
     double min_power = range.min;
     double max_power = range.max;
-    double power_slope = max_power - min_power;
-    current_power = min_power + cpu_load * power_slope;
+
+    /**
+     * The min_power states how much we consume when only one single
+     * core is working. This means that when cpu_load == 1/coreCount, then
+     * current_power == min_power.
+     *
+     * The maximum must be reached when all cores are working (but 1 core was
+     * already accounted for by min_power)
+     * i.e., we need min_power + (maxCpuLoad-1/coreCount)*power_slope == max_power
+     * (maxCpuLoad is by definition 1)
+     */
+    double power_slope;
+    int coreCount = host->coreCount();
+    double coreReciprocal = static_cast<double>(1) / static_cast<double>(coreCount);
+    if (coreCount > 1)
+      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 - coreReciprocal) * power_slope;
   }
   else { /* Our machine is idle, take the dedicated value! */
     current_power = range.idle;
@@ -217,8 +234,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::surf::VirtualMachine*>(host.pimpl_)) // Ignore virtual machines
     return;
   host.extension_set(new HostEnergy(&host));
 }
@@ -229,10 +245,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::HostImpl* host     = sghost->pimpl_;
     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>();
+      host = vm->getPm()->pimpl_;
 
     HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
 
@@ -242,8 +258,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::surf::VirtualMachine*>(host.pimpl_)) // Ignore virtual machines
     return;
 
   HostEnergy *host_energy = host.extension<HostEnergy>();
@@ -254,8 +269,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::surf::VirtualMachine*>(host.pimpl_))
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();