[surf] Move some code in a simgrid::surf namespace

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

diff --git a/src/surf/plugins/energy.hpp b/src/surf/plugins/energy.hpp
index 8f8d5bd..a1ee85c 100644 (file)
--- a/src/surf/plugins/energy.hpp
+++ b/src/surf/plugins/energy.hpp
@@ -4,20 +4,25 @@
 /* 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 "../cpu_interface.hpp"
+#include <xbt/base.h>
+
+#include "../host_interface.hpp"
 #include <map>
 
-#ifndef CALLBACK_HPP_
-#define CALLBACK_HPP_
+#ifndef ENERGY_CALLBACK_HPP_
+#define ENERGY_CALLBACK_HPP_
+
+namespace simgrid {
+namespace energy {
 
-class CpuEnergy;
+class XBT_PRIVATE HostEnergy;
 
-extern std::map<Cpu*, CpuEnergy*> *surf_energy;
+extern XBT_PRIVATE std::map<simgrid::surf::Host*, HostEnergy*> *surf_energy;
 
-class CpuEnergy {
+class HostEnergy {
 public:
-  CpuEnergy(Cpu *ptr);
-  ~CpuEnergy();
+  HostEnergy(simgrid::surf::Host *ptr);
+  ~HostEnergy();
 
   double getCurrentWattsValue(double cpu_load);
   double getConsumedEnergy();
@@ -29,7 +34,14 @@ 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;
+  simgrid::surf::Host *host;
+
+  void unref() {if (--refcount == 0) delete this;}
+  void ref() {refcount++;}
+  int refcount = 1;
 };
 
-#endif /* CALLBACK_HPP_ */
+}
+}
+
+#endif /* ENERGY_CALLBACK_HPP_ */