X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..3715b2a421abd8357f41fb2be3c25a351f1af8cb:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 4e1ac71e1b..de57ece312 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -15,19 +15,17 @@
  * Classes *
  ***********/
 class CpuTiTrace;
-typedef CpuTiTrace *CpuTiTracePtr;
-
 class CpuTiTgmr;
-typedef CpuTiTgmr *CpuTiTgmrPtr;
-
 class CpuTiModel;
-typedef CpuTiModel *CpuTiModelPtr;
-
 class CpuTi;
-typedef CpuTi *CpuTiPtr;
-
 class CpuTiAction;
-typedef CpuTiAction *CpuTiActionPtr;
+
+typedef boost::intrusive::list<CpuTi> CpuTiList;
+typedef boost::intrusive::list_base_hook<> cpuTiHook;
+
+struct tiTag;
+typedef boost::intrusive::list<CpuTiAction, boost::intrusive::base_hook<boost::intrusive::list_base_hook<boost::intrusive::tag<tiTag> > > > ActionTiList;
+typedef boost::intrusive::list_base_hook<boost::intrusive::tag<tiTag> > actionTiHook;
 
 /*********
  * Trace *
@@ -50,7 +48,7 @@ private:
 };
 
 enum trace_type {
-  
+
   TRACE_FIXED,                /*< Trace fixed, no availability file */
   TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
 };
@@ -73,7 +71,7 @@ public:
   double m_lastTime;             /*< Integral interval last point (discret time) */
   double m_total;                 /*< Integral total between 0 and last_pointn */
 
-  CpuTiTracePtr p_trace;
+  CpuTiTrace *p_trace;
   tmgr_trace_t p_powerTrace;
 };
 
@@ -84,66 +82,63 @@ class CpuTiModel : public CpuModel {
 public:
   CpuTiModel();
   ~CpuTiModel();
-
-  void parseInit(sg_platf_host_cbarg_t host);
-  CpuTiPtr createResource(const char *name,  xbt_dynar_t powerPeak,
+  Cpu *createCpu(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,
                           xbt_dict_t cpu_properties);
-  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;
+  ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
+  CpuTiList *p_modifiedCpu;
   xbt_heap_t p_tiActionHeap;
 
 protected:
-  void NotifyResourceTurnedOn(ResourcePtr){};
-  void NotifyResourceTurnedOff(ResourcePtr){};
+  void NotifyResourceTurnedOn(Resource*){};
+  void NotifyResourceTurnedOff(Resource*){};
 
-  void NotifyActionCancel(ActionPtr){};
-  void NotifyActionResume(ActionPtr){};
-  void NotifyActionSuspend(ActionPtr){};
+  void NotifyActionCancel(Action*){};
+  void NotifyActionResume(Action*){};
+  void NotifyActionSuspend(Action*){};
 };
 
 /************
  * Resource *
  ************/
-class CpuTi : public Cpu {
+class CpuTi : public cpuTiHook, public Cpu {
 public:
   CpuTi() {};
-  CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak,
+  CpuTi(CpuTiModel *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();
 
-  void updateState(tmgr_trace_event_t event_type, double value, double date);  
+  void updateState(tmgr_trace_event_t event_type, double value, double date);
   void updateActionsFinishTime(double now);
   bool isUsed();
   void printCpuTiModel();
-  CpuActionPtr execute(double size);
-  CpuActionPtr sleep(double duration);
+  CpuAction *execute(double size);
+  CpuAction *sleep(double duration);
   double getAvailableSpeed();
 
   double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
   double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
   int getNbPstates() {THROW_UNIMPLEMENTED;};
-  void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  void setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  int  getPstate() { THROW_UNIMPLEMENTED;}
+  void modified(bool modified);
 
-  CpuTiTgmrPtr p_availTrace;       /*< Structure with data needed to integrate trace file */
+  CpuTiTgmr *p_availTrace;       /*< Structure with data needed to integrate trace file */
   tmgr_trace_event_t p_stateEvent;       /*< trace file with states events (ON or OFF) */
   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 indicates whether share resources must be recalculated or not */
+  ActionTiList *p_actionSet;        /*< set with all actions running on cpu */
   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);
@@ -153,21 +148,19 @@ public:
  * Action *
  **********/
 
-class CpuTiAction: public CpuAction {
-  friend CpuActionPtr CpuTi::execute(double size);
-  friend CpuActionPtr CpuTi::sleep(double duration);
+class CpuTiAction: public actionTiHook, public CpuAction {
+  friend CpuAction *CpuTi::execute(double size);
+  friend CpuAction *CpuTi::sleep(double duration);
   friend void CpuTi::updateActionsFinishTime(double now);//FIXME
   friend void CpuTi::updateRemainingAmount(double now);//FIXME
 
 public:
-  CpuTiAction() {};
-  CpuTiAction(CpuTiModelPtr model, double cost, bool failed,
-  		                 CpuTiPtr cpu);
+  CpuTiAction(CpuTiModel *model, double cost, bool failed,
+  		                 CpuTi *cpu);
 
   void setState(e_surf_action_state_t state);
   int unref();
   void cancel();
-  void recycle();
   void updateIndexHeap(int i);
   void suspend();
   void resume();
@@ -175,11 +168,10 @@ public:
   void setMaxDuration(double duration);
   void setPriority(double priority);
   double getRemains();
-  void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
+  void setAffinity(Cpu */*cpu*/, unsigned long /*mask*/) {};
 
-  CpuTiPtr p_cpu;
+  CpuTi *p_cpu;
   int m_indexHeap;
-  s_xbt_swag_hookup_t p_cpuListHookup;
   int m_suspended;
 private:
 };