X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82f048773df5d2086fe2044d2bef0cbffdf6f982..e1038e90b6035149be3fa02273cff848f4914ac9:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 2b37326c97..9d3491d8c6 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -84,7 +84,7 @@ class CpuTiAction: public CpuAction {
 public:
   CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
 
-  void setState(e_surf_action_state_t state) override;
+  void setState(simgrid::surf::Action::State state) override;
   int unref() override;
   void cancel() override;
   void updateIndexHeap(int i);
@@ -110,9 +110,7 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-        tmgr_trace_t speedTrace, int core,
-        tmgr_trace_t stateTrace) ;
+  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
   ~CpuTi();
 
   void setSpeedTrace(tmgr_trace_t trace) override;
@@ -128,10 +126,10 @@ public:
 
   void modified(bool modified);
 
-  CpuTiTgmr *availTrace_;       /*< Structure with data needed to integrate trace file */
-  ActionTiList *actionSet_;        /*< set with all actions running on cpu */
-  double sumPriority_;          /*< the sum of actions' priority that are running on cpu */
-  double lastUpdate_ = 0;       /*< last update of actions' remaining amount done */
+  CpuTiTgmr *speedIntegratedTrace_ = NULL;/*< Structure with data needed to integrate trace file */
+  ActionTiList *actionSet_ = NULL;        /*< set with all actions running on cpu */
+  double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
+  double lastUpdate_ = 0;  /*< last update of actions' remaining amount done */
 
   double currentFrequency_;
 
@@ -149,8 +147,7 @@ class CpuTiModel : public CpuModel {
 public:
   CpuTiModel();
   ~CpuTiModel();
-  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPeak,
-      tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace) override;
+  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPerPstate, int core) override;
   double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;