X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fe1137efda109ff1a402ab5f8317d3ec3a676dc..d2d941a9e68e4389cd4148ccbe1cb35da63e54e4:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index cf4016b6e4..06b10dfaf8 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -13,6 +13,9 @@
 /* Epsilon */
 #define EPSILON 0.000000001
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
@@ -29,7 +32,7 @@ struct tiTag;
  *********/
 class CpuTiTrace {
 public:
-  CpuTiTrace(tmgr_trace_t powerTrace);
+  CpuTiTrace(tmgr_trace_t speedTrace);
   ~CpuTiTrace();
 
   double integrateSimple(double a, double b);
@@ -47,13 +50,13 @@ private:
 enum trace_type {
 
   TRACE_FIXED,                /*< Trace fixed, no availability file */
-  TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
+  TRACE_DYNAMIC               /*< Dynamic, have an availability file */
 };
 
 class CpuTiTgmr {
 public:
   CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){};
-  CpuTiTgmr(tmgr_trace_t power_trace, double value);
+  CpuTiTgmr(tmgr_trace_t speedTrace, double value);
   ~CpuTiTgmr();
 
   double integrate(double a, double b);
@@ -62,14 +65,14 @@ public:
   double getPowerScale(double a);
 
   trace_type m_type;
-  double m_value;                 /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */
+  double m_value;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
-  double m_lastTime;             /*< Integral interval last point (discret time) */
+  double m_lastTime;             /*< Integral interval last point (discrete time) */
   double m_total;                 /*< Integral total between 0 and last_pointn */
 
   CpuTiTrace *p_trace;
-  tmgr_trace_t p_powerTrace;
+  tmgr_trace_t p_speedTrace;
 };
 
 /**********
@@ -78,10 +81,6 @@ public:
 
 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);
@@ -116,10 +115,9 @@ typedef boost::intrusive::list<
 class CpuTi : public Cpu {
 public:
   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) ;
+  CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+        int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
+        e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) ;
   ~CpuTi();
 
   void updateState(tmgr_trace_event_t event_type, double value, double date);
@@ -139,7 +137,7 @@ public:
 
   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 */
+  tmgr_trace_event_t p_speedEvent;       /*< 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 */
@@ -162,12 +160,11 @@ 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,
+  Cpu *createCpu(simgrid::Host *host,  xbt_dynar_t speedPeak,
+                          int pstate, double speedScale,
+                          tmgr_trace_t speedTrace, int core,
                           e_surf_resource_state_t state_initial,
-                          tmgr_trace_t state_trace,
-                          xbt_dict_t cpu_properties);
+                          tmgr_trace_t state_trace);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   void addTraces();
@@ -177,10 +174,13 @@ public:
   xbt_heap_t p_tiActionHeap;
 
 protected:
-  void NotifyResourceTurnedOn(Resource*){};
-  void NotifyResourceTurnedOff(Resource*){};
+  void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
+  void NotifyResourceTurnedOff(simgrid::surf::Resource*){};
 
   void NotifyActionCancel(Action*){};
   void NotifyActionResume(Action*){};
   void NotifyActionSuspend(Action*){};
 };
+
+}
+}