[mc] Use member hooks for CpuTi

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 2edf742..21f92c5 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -836,11 +836,11 @@ CpuAction *CpuTi::sleep(double duration)
 void CpuTi::modified(bool modified){
   CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
   if (modified) {
 void CpuTi::modified(bool modified){
   CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
   if (modified) {

-    if (!is_linked()) {
+    if (!cpu_ti_hook.is_linked()) {

       modifiedCpu->push_back(*this);
     }
   } else {
       modifiedCpu->push_back(*this);
     }
   } else {

-    if (is_linked()) {
+    if (cpu_ti_hook.is_linked()) {

       modifiedCpu->erase(modifiedCpu->iterator_to(*this));
     }
   }
       modifiedCpu->erase(modifiedCpu->iterator_to(*this));
     }
   }


@@ -884,7 +884,7 @@ int CpuTiAction::unref()
        if (actionHook::is_linked())
          getStateSet()->erase(getStateSet()->iterator_to(*this));
     /* remove from action_set */
        if (actionHook::is_linked())
          getStateSet()->erase(getStateSet()->iterator_to(*this));
     /* remove from action_set */

-    if (actionTiHook::is_linked())
+    if (action_ti_hook.is_linked())

       p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
     /* remove from heap */
     xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);
       p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
     /* remove from heap */
     xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 10ec1b0..e08d5ca 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -20,12 +20,7 @@ class CpuTiModel;
 class CpuTi;
 class CpuTiAction;
 
 class CpuTi;
 class CpuTiAction;
 

-typedef boost::intrusive::list<CpuTi> CpuTiList;
-typedef boost::intrusive::list_base_hook<> cpuTiHook;
-

 struct tiTag;
 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 *
 
 /*********
  * Trace *


@@ -75,40 +70,48 @@ public:
   tmgr_trace_t p_powerTrace;
 };
 
   tmgr_trace_t p_powerTrace;
 };
 

-/*********
- * Model *
- *********/
-class CpuTiModel : public CpuModel {
-public:
-  CpuTiModel();
-  ~CpuTiModel();
-  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);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  void addTraces();
+/**********
+ * Action *
+ **********/

 
 

-  ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
-  CpuTiList *p_modifiedCpu;
-  xbt_heap_t p_tiActionHeap;
+class CpuTiAction: public CpuAction {
+  friend class CpuTi;
+  // 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(CpuTiModel *model, double cost, bool failed,
+                   CpuTi *cpu);

 
 

-protected:
-  void NotifyResourceTurnedOn(Resource*){};
-  void NotifyResourceTurnedOff(Resource*){};
+  void setState(e_surf_action_state_t state);
+  int unref();
+  void cancel();
+  void updateIndexHeap(int i);
+  void suspend();
+  void resume();
+  bool isSuspended();
+  void setMaxDuration(double duration);
+  void setPriority(double priority);
+  double getRemains();
+  void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) {};

 
 

-  void NotifyActionCancel(Action*){};
-  void NotifyActionResume(Action*){};
-  void NotifyActionSuspend(Action*){};
+  CpuTi *p_cpu;
+  int m_indexHeap;
+  int m_suspended;
+public:
+  boost::intrusive::list_member_hook<> action_ti_hook;

 };
 
 };
 

+typedef boost::intrusive::member_hook<
+  CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions;
+typedef boost::intrusive::list<
+  CpuTiAction, ActionTiListOptions > ActionTiList;
+

 /************
  * Resource *
  ************/
 /************
  * Resource *
  ************/

-class CpuTi : public cpuTiHook, public Cpu {
+class CpuTi : public Cpu {

 public:
   CpuTi() {};
   CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t powerPeak,
 public:
   CpuTi() {};
   CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t powerPeak,


@@ -142,36 +145,40 @@ public:
   double current_frequency;
 
   void updateRemainingAmount(double now);
   double current_frequency;
 
   void updateRemainingAmount(double now);

+public:
+  boost::intrusive::list_member_hook<> cpu_ti_hook;

 };
 
 };
 

-/**********
- * Action *
- **********/
-
-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
+typedef boost::intrusive::member_hook<
+  CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions;
+typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;

 
 

+/*********
+ * Model *
+ *********/
+class CpuTiModel : public CpuModel {

 public:
 public:

-  CpuTiAction(CpuTiModel *model, double cost, bool failed,
-                                CpuTi *cpu);
+  CpuTiModel();
+  ~CpuTiModel();
+  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);
+  double shareResources(double now);
+  void updateActionsState(double now, double delta);
+  void addTraces();

 
 

-  void setState(e_surf_action_state_t state);
-  int unref();
-  void cancel();
-  void updateIndexHeap(int i);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  void setMaxDuration(double duration);
-  void setPriority(double priority);
-  double getRemains();
-  void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) {};
+  ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
+  CpuTiList *p_modifiedCpu;
+  xbt_heap_t p_tiActionHeap;

 
 

-  CpuTi *p_cpu;
-  int m_indexHeap;
-  int m_suspended;
-private:
+protected:
+  void NotifyResourceTurnedOn(Resource*){};
+  void NotifyResourceTurnedOff(Resource*){};
+
+  void NotifyActionCancel(Action*){};
+  void NotifyActionResume(Action*){};
+  void NotifyActionSuspend(Action*){};

 };
 };