every occurence of power in surf should be renamed to speed, as it is not the electic...

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

diff --git a/src/surf/plugins/energy.hpp b/src/surf/plugins/energy.hpp
index f3d700c..a50a6f6 100644 (file)
--- a/src/surf/plugins/energy.hpp
+++ b/src/surf/plugins/energy.hpp
@@ -6,20 +6,20 @@
 
 #include <xbt/base.h>
 
-#include "../cpu_interface.hpp"
+#include "../host_interface.hpp"
 #include <map>
 
 #ifndef ENERGY_CALLBACK_HPP_
 #define ENERGY_CALLBACK_HPP_
 
-class XBT_PRIVATE CpuEnergy;
+class XBT_PRIVATE HostEnergy;
 
-extern XBT_PRIVATE std::map<Cpu*, CpuEnergy*> *surf_energy;
+extern XBT_PRIVATE std::map<Host*, HostEnergy*> *surf_energy;
 
-class CpuEnergy {
+class HostEnergy {
 public:
-  CpuEnergy(Cpu *ptr);
-  ~CpuEnergy();
+  HostEnergy(Host *ptr);
+  ~HostEnergy();
 
   double getCurrentWattsValue(double cpu_load);
   double getConsumedEnergy();
@@ -31,7 +31,7 @@ public:
   double watts_off;                      /*< Consumption when the machine is turned off (shutdown) */
   double total_energy;                                 /*< Total energy consumed by the host */
   double last_updated;                                 /*< Timestamp of the last energy update event*/
-  Cpu *cpu;
+  Host *host;
 
   void unref() {if (--refcount == 0) delete this;}
   void ref() {refcount++;}