[mc] Use member hooks for CpuTi

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 79a8045..e08d5ca 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,4 +1,10 @@
-#include "cpu.hpp"
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "cpu_interface.hpp"

 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
 
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
 


@@ -9,19 +15,12 @@
  * Classes *
  ***********/
 class CpuTiTrace;
  * Classes *
  ***********/
 class CpuTiTrace;

-typedef CpuTiTrace *CpuTiTracePtr;
-

 class CpuTiTgmr;
 class CpuTiTgmr;

-typedef CpuTiTgmr *CpuTiTgmrPtr;
-

 class CpuTiModel;
 class CpuTiModel;

-typedef CpuTiModel *CpuTiModelPtr;
-

 class CpuTi;
 class CpuTi;

-typedef CpuTi *CpuTiPtr;
-

 class CpuTiAction;
 class CpuTiAction;

-typedef CpuTiAction *CpuTiActionPtr;
+
+struct tiTag;

 
 /*********
  * Trace *
 
 /*********
  * Trace *


@@ -44,7 +43,7 @@ private:
 };
 
 enum trace_type {
 };
 
 enum trace_type {

-  
+

   TRACE_FIXED,                /*< Trace fixed, no availability file */
   TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
 };
   TRACE_FIXED,                /*< Trace fixed, no availability file */
   TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
 };


@@ -67,94 +66,119 @@ public:
   double m_lastTime;             /*< Integral interval last point (discret time) */
   double m_total;                 /*< Integral total between 0 and last_pointn */
 
   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;
 };
 
   tmgr_trace_t p_powerTrace;
 };
 

+/**********
+ * Action *
+ **********/

 
 

-/*********
- * Model *
- *********/
-class CpuTiModel : public CpuModel {
+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:
 public:

-  CpuTiModel();
-  ~CpuTiModel();
-
-  void parseInit(sg_platf_host_cbarg_t host);
-  CpuTiPtr createResource(const char *name, double power_peak, 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);
+  CpuTiAction(CpuTiModel *model, double cost, bool failed,
+                   CpuTi *cpu);

 
 

-protected:
-  void NotifyResourceTurnedOn(ResourcePtr r){};
-  void NotifyResourceTurnedOff(ResourcePtr r){};
+  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(ActionPtr a){};
-  void NotifyActionResume(ActionPtr a){};
-  void NotifyActionSuspend(ActionPtr a){};
+  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 *
  ************/
 class CpuTi : public Cpu {
 public:
 /************
  * Resource *
  ************/
 class CpuTi : public Cpu {
 public:

-  CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
-        double powerScale, tmgr_trace_t powerTrace, int core,
+  CpuTi() {};
+  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) ;
         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 updateState(tmgr_trace_event_t event_type, double value, double date);
+  void updateActionsFinishTime(double now);
+  bool isUsed();

   void printCpuTiModel();
   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 */
-  CpuTiTgmrPtr p_availTrace;       /*< Structure with data needed to integrate trace file */
-  e_surf_resource_state_t p_stateCurrent;        /*< CPU current state (ON or OFF) */
+  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 setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  int  getPstate() { THROW_UNIMPLEMENTED;}
+  void modified(bool modified);
+
+  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_stateEvent;       /*< trace file with states events (ON or OFF) */

-  tmgr_trace_event_t p_powerEvent;       /*< trace file with availabitly 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 */
+  tmgr_trace_event_t p_powerEvent;       /*< trace file with availability events */
+  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 */
   double m_sumPriority;          /*< the sum of actions' priority that are running on cpu */
   double m_lastUpdate;           /*< last update of actions' remaining amount done */

+
+  double current_frequency;
+

   void updateRemainingAmount(double now);
   void updateRemainingAmount(double now);

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

 };
 
 };
 

-/**********
- * Action *
- **********/
-class CpuTiAction: public CpuAction {
+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(CpuTiModelPtr model, double cost, bool failed): CpuAction(model, cost, failed) {};
+  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 recycle();
-  void updateIndexHeap(int i);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  void setMaxDuration(double duration);
-  void setPriority(double priority);
-  double getRemains();
-  CpuTiPtr p_cpu;
-  int m_indexHeap;
+  ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
+  CpuTiList *p_modifiedCpu;
+  xbt_heap_t p_tiActionHeap;

 
 

-private:
+protected:
+  void NotifyResourceTurnedOn(Resource*){};
+  void NotifyResourceTurnedOff(Resource*){};
+
+  void NotifyActionCancel(Action*){};
+  void NotifyActionResume(Action*){};
+  void NotifyActionSuspend(Action*){};

 };
 };