X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de74e33ac31948d22f805fed0807be831cb8fdbd..310e28eac7bc0c752880767cd88a66d64ebf04ef:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 79a8045fce..53f53613ed 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"
 
@@ -71,7 +71,6 @@ public:
   tmgr_trace_t p_powerTrace;
 };
 
-
 /*********
  * Model *
  *********/
@@ -81,7 +80,8 @@ public:
   ~CpuTiModel();
 
   void parseInit(sg_platf_host_cbarg_t host);
-  CpuTiPtr createResource(const char *name, double power_peak, double power_scale,
+  CpuTiPtr createResource(const char *name,  xbt_dynar_t powerPeak,
+                          int pstate, double power_scale,
                           tmgr_trace_t power_trace, int core,
                           e_surf_resource_state_t state_initial,
                           tmgr_trace_t state_trace,
@@ -89,14 +89,19 @@ public:
   CpuTiActionPtr createAction(double cost, bool failed);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
+  void addTraces();
+
+  ActionListPtr 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){};
 };
 
 /************
@@ -104,43 +109,54 @@ protected:
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
-        double powerScale, tmgr_trace_t powerTrace, int core,
+  CpuTi() {};
+  CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak,
+        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);
-  bool isUsed();  
-  double getSpeed (double load);
-  double getAvailableSpeed ();
-  void addTraces();
+  void updateActionsFinishTime(double now);
+  bool isUsed();
   void printCpuTiModel();
-  CpuTiModelPtr getModel();
   CpuActionPtr execute(double size);
   CpuActionPtr sleep(double duration);
-  e_surf_resource_state_t getState();
-  
-  double m_powerPeak;            /*< CPU power peak */
-  double m_powerScale;           /*< Percentage of CPU disponible */
+  double getAvailableSpeed();
+
+  double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
+  double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  int getNbPstates() {THROW_UNIMPLEMENTED;};
+  void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+
   CpuTiTgmrPtr p_availTrace;       /*< Structure with data needed to integrate trace file */
-  e_surf_resource_state_t p_stateCurrent;        /*< CPU current state (ON or OFF) */
   tmgr_trace_event_t p_stateEvent;       /*< trace file with states events (ON or OFF) */
-  tmgr_trace_event_t p_powerEvent;       /*< trace file with availabitly events */
+  tmgr_trace_event_t p_powerEvent;       /*< trace file with availability events */
   xbt_swag_t p_actionSet;        /*< set with all actions running on cpu */
-  s_xbt_swag_hookup_t p_modifiedCpuHookup;      /*< hookup to swag that indicacates whether share resources must be recalculated or not */
+  s_xbt_swag_hookup_t p_modifiedCpuHookup;      /*< hookup to swag that indicates whether share resources must be recalculated or not */
   double m_sumPriority;          /*< the sum of actions' priority that are running on cpu */
   double m_lastUpdate;           /*< last update of actions' remaining amount done */
+
+  int m_pstate;								/*< Current pstate (index in the power_peak_list)*/
+  double current_frequency;
+
   void updateRemainingAmount(double now);
 };
 
 /**********
  * Action *
  **********/
+
 class CpuTiAction: public CpuAction {
+  friend CpuActionPtr CpuTi::execute(double size);
+  friend CpuActionPtr CpuTi::sleep(double duration);
+  friend void CpuTi::updateActionsFinishTime(double now);//FIXME
+  friend void CpuTi::updateRemainingAmount(double now);//FIXME
+
 public:
-  CpuTiAction(CpuTiModelPtr model, double cost, bool failed): CpuAction(model, cost, failed) {};
+  CpuTiAction() {};
+  CpuTiAction(CpuTiModelPtr model, double cost, bool failed,
+  		                 CpuTiPtr cpu);
 
   void setState(e_surf_action_state_t state);
   int unref();
@@ -153,8 +169,12 @@ 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;
+  int m_suspended;
 private:
 };