remove completely the energy concern from the core

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

diff --git a/src/surf/plugins/energy.hpp b/src/surf/plugins/energy.hpp
index ab9d1f3..389abd9 100644 (file)
--- a/src/surf/plugins/energy.hpp
+++ b/src/surf/plugins/energy.hpp
@@ -1,4 +1,6 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* energy.hpp: internal interface to the energy plugin                      */
+
+/* Copyright (c) 2014-2016. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,20 +8,23 @@
 
 #include <xbt/base.h>
 
-#include "../cpu_interface.hpp"
+#include "src/surf/host_interface.hpp"
 #include <map>
 
-#ifndef CALLBACK_HPP_
-#define CALLBACK_HPP_
+#ifndef ENERGY_CALLBACK_HPP_
+#define ENERGY_CALLBACK_HPP_
+
+namespace simgrid {
+namespace energy {
 
-class XBT_PRIVATE CpuEnergy;
+class XBT_PRIVATE HostEnergy;
 
-extern XBT_PRIVATE 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();
@@ -31,7 +36,19 @@ 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_ */
+XBT_PUBLIC(double) surf_host_get_wattmin_at(sg_host_t resource, int pstate);
+XBT_PUBLIC(double) surf_host_get_wattmax_at(sg_host_t resource, int pstate);
+XBT_PUBLIC(double) surf_host_get_consumed_energy(sg_host_t host);
+}
+}
+
+
+
+#endif /* ENERGY_CALLBACK_HPP_ */