X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..5e2c8aeab0ec45fb9945018b9de3cab5c1019875:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index cccac330f7..9a14110c97 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,4 +1,4 @@
-#include "cpu.hpp"
+#include "cpu_interface.hpp"
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
 
@@ -92,13 +92,17 @@ public:
   void updateActionsState(double now, double delta);
   void addTraces();
 
+  xbt_swag_t p_runningActionSetThatDoesNotNeedBeingChecked;
+  xbt_swag_t p_modifiedCpu;
+  xbt_heap_t p_tiActionHeap;
+
 protected:
-  void NotifyResourceTurnedOn(ResourcePtr r){};
-  void NotifyResourceTurnedOff(ResourcePtr r){};
+  void NotifyResourceTurnedOn(ResourcePtr){};
+  void NotifyResourceTurnedOff(ResourcePtr){};
 
-  void NotifyActionCancel(ActionPtr a){};
-  void NotifyActionResume(ActionPtr a){};
-  void NotifyActionSuspend(ActionPtr a){};
+  void NotifyActionCancel(ActionPtr){};
+  void NotifyActionResume(ActionPtr){};
+  void NotifyActionSuspend(ActionPtr){};
 };
 
 /************
@@ -111,7 +115,7 @@ public:
         int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
         e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
 	xbt_dict_t properties) ;
-  ~CpuTi() {};
+  ~CpuTi();
 
   void updateState(tmgr_trace_event_t event_type, double value, double date);  
   void updateActionFinishDate(double now);
@@ -122,15 +126,15 @@ public:
   CpuActionPtr sleep(double duration);
   double getAvailableSpeed();
 
-  xbt_dynar_t getWattsRangeList() {};
-  double getCurrentWattsValue(double cpu_load) {};
-  void updateEnergy(double cpu_load) {};
+  xbt_dynar_t getWattsRangeList() {THROW_UNIMPLEMENTED;};
+  double getCurrentWattsValue(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
+  void updateEnergy(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
 
-  double getCurrentPowerPeak() {};
-  double getPowerPeakAt(int pstate_index) {};
-  int getNbPstates() {};
-  void setPowerPeakAt(int pstate_index) {};
-  double getConsumedEnergy() {};
+  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) */
@@ -170,6 +174,9 @@ public:
   void setMaxDuration(double duration);
   void setPriority(double priority);
   double getRemains();
+  void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
+  void setBound(double /*bound*/) {};
+
   CpuTiPtr p_cpu;
   int m_indexHeap;
   s_xbt_swag_hookup_t p_cpuListHookup;