reindent

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

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index be3fcd7..8f5a2ba 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <src/surf/plugins/energy.hpp>
-#include <src/surf/cpu_cas01.hpp>
+#include <src/surf/cpu_interface.hpp>
 #include <src/surf/virtual_machine.hpp>
 
 /** @addtogroup SURF_plugin_energy
@@ -100,7 +100,8 @@ void sg_energy_plugin_init() {
     });
 
     simgrid::surf::VMCreatedCallbacks.connect([](simgrid::surf::VirtualMachine* vm) {
-       std::map<simgrid::surf::Host*, HostEnergy*>::iterator host_energy_it = surf_energy->find(vm->p_subWs);
+       std::map<simgrid::surf::Host*, HostEnergy*>::iterator host_energy_it =
+                       surf_energy->find(vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID));
        xbt_assert(host_energy_it != surf_energy->end(), "The host is not in surf_energy.");
        (*surf_energy)[vm] = host_energy_it->second;
        host_energy_it->second->ref(); // protect the HostEnergy from getting deleted too early
@@ -118,10 +119,9 @@ void sg_energy_plugin_init() {
        host_energy_it->second->unref();
        surf_energy->erase(host_energy_it);
     });
-    simgrid::surf::CpuAction::onStateChange.connect([]
-                                                                                                        (simgrid::surf::CpuAction *action,
-                                                                                                                        e_surf_action_state_t old,
-                                                                                                                        e_surf_action_state_t cur) {
+    simgrid::surf::CpuAction::onStateChange.connect([](simgrid::surf::CpuAction *action,
+                                                       e_surf_action_state_t old,
+                                                       e_surf_action_state_t cur) {
        const char *name = getActionCpu(action)->getName();
        simgrid::surf::Host *host = static_cast<simgrid::surf::Host*>(surf_host_resource_priv(sg_host_by_name(name)));
 
@@ -184,31 +184,29 @@ HostEnergy::~HostEnergy(){
 double HostEnergy::getWattMinAt(int pstate) {
   xbt_dynar_t power_range_list = power_range_watts_list;
   xbt_assert(power_range_watts_list, "No power range properties specified for host %s", host->getName());
-  xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast<simgrid::surf::CpuCas01*>(host->p_cpu)->getPState(), xbt_dynar_t);
+  xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, host->p_cpu->getPState(), xbt_dynar_t);
   double min_power = xbt_dynar_get_as(current_power_values, 0, double);
   return min_power;
 }
 double HostEnergy::getWattMaxAt(int pstate) {
   xbt_dynar_t power_range_list = power_range_watts_list;
   xbt_assert(power_range_watts_list, "No power range properties specified for host %s", host->getName());
-  xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast<simgrid::surf::CpuCas01*>(host->p_cpu)->getPState(), xbt_dynar_t);
+  xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, host->p_cpu->getPState(), xbt_dynar_t);
   double max_power = xbt_dynar_get_as(current_power_values, 1, double);
   return max_power;
 }
 
-/**
- * Computes the power consumed by the host according to the current pstate and processor load
- *
- */
+/** @brief Computes the power consumed by the host according to the current pstate and processor load */
 double HostEnergy::getCurrentWattsValue(double cpu_load)
 {
        xbt_dynar_t power_range_list = power_range_watts_list;
        xbt_assert(power_range_watts_list, "No power range properties specified for host %s", host->getName());
 
+       int pstate = host->p_cpu->getPState();
+       xbt_assert(pstate < (int)xbt_dynar_length(power_range_list),
+                       "pstate %d >= power range amound %d",pstate,(int)xbt_dynar_length(power_range_list));
     /* retrieve the power values associated with the current pstate */
-    xbt_dynar_t current_power_values = xbt_dynar_get_as( power_range_list,
-      static_cast<simgrid::surf::CpuCas01*>(host->p_cpu)->getPState(),
-      xbt_dynar_t);
+    xbt_dynar_t current_power_values = xbt_dynar_get_as( power_range_list, pstate, xbt_dynar_t);
 
     /* min_power corresponds to the idle power (cpu load = 0) */
     /* max_power is the power consumed at 100% cpu load       */
@@ -226,11 +224,9 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
 
 double HostEnergy::getConsumedEnergy()
 {
-
        if(last_updated < surf_get_clock())
                update_consumption(host, this);
        return total_energy;
-
 }
 
 xbt_dynar_t HostEnergy::getWattsRangeList()