X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..355a8d7a17f462faebbac57c04517f44702a7652:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 1c5d3ecadb..bf841ed359 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -110,12 +110,10 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-        int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
-        int initiallyOn, tmgr_trace_t stateTrace) ;
+  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
   ~CpuTi();
 
-  void set_speed_trace(tmgr_trace_t trace) override;
+  void setSpeedTrace(tmgr_trace_t trace) override;
 
   void apply_event(tmgr_trace_iterator_t event, double value) override;
   void updateActionsFinishTime(double now);
@@ -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,10 +147,7 @@ class CpuTiModel : public CpuModel {
 public:
   CpuTiModel();
   ~CpuTiModel();
-  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPeak,
-                          int pstate, double speedScale,
-                          tmgr_trace_t speedTrace, int core,
-                          int initiallyOn, 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;