Merge branch 'torus'

[simgrid.git] / src / surf / cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 7e27e52b2ef12c3e714e97f542f6fef475de2fda..53f53613ed344d4dee975b9944f2794434135a73 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -71,7 +71,6 @@ public:
   tmgr_trace_t p_powerTrace;
 };
 
-
 /*********
  * Model *
  *********/
@@ -92,7 +91,7 @@ public:
   void updateActionsState(double now, double delta);
   void addTraces();
 
-  xbt_swag_t p_runningActionSetThatDoesNotNeedBeingChecked;
+  ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked;
   xbt_swag_t p_modifiedCpu;
   xbt_heap_t p_tiActionHeap;
 
@@ -125,15 +124,10 @@ public:
   CpuActionPtr sleep(double duration);
   double getAvailableSpeed();
 
-  xbt_dynar_t getWattsRangeList() {THROW_UNIMPLEMENTED;};
-  double getCurrentWattsValue(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
-  void updateEnergy(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
-
   double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
   double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
   int getNbPstates() {THROW_UNIMPLEMENTED;};
   void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
-  double getConsumedEnergy() {THROW_UNIMPLEMENTED;};
 
   CpuTiTgmrPtr p_availTrace;       /*< Structure with data needed to integrate trace file */
   tmgr_trace_event_t p_stateEvent;       /*< trace file with states events (ON or OFF) */