X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90559b37332c0f396c09fd1c75326cfbdbbe5dc1..dd105cd510efe4f0acd7af38bc2d6139f3d7f1f8:/src/surf/cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index f0f586431f..f05453dcb5 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -25,11 +25,9 @@ class XBT_PRIVATE CpuCas01Action;
 class CpuCas01Model : public simgrid::surf::CpuModel {
 public:
   CpuCas01Model();
-  ~CpuCas01Model();
+  ~CpuCas01Model() override;
 
-  Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, double speedScale,
-      tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace) override;
-  double next_occuring_event_full(double now) override;
+  Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
   ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
 };
 
@@ -39,16 +37,15 @@ public:
 
 class CpuCas01 : public Cpu {
 public:
-  CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-      double speedScale, tmgr_trace_t speedTrace, int core, tmgr_trace_t stateTrace) ;
-  ~CpuCas01();
+  CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+  ~CpuCas01() override;
   void apply_event(tmgr_trace_iterator_t event, double value) override;
   CpuAction *execution_start(double size) override;
   CpuAction *sleep(double duration) override;
 
   bool isUsed() override;
 
-  xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
+  std::vector<double> * getSpeedPeakList(); // FIXME: killme to hide our internals
 
 protected:
   void onSpeedChange() override;
@@ -61,10 +58,8 @@ class CpuCas01Action: public CpuAction {
   friend CpuAction *CpuCas01::execution_start(double size);
   friend CpuAction *CpuCas01::sleep(double duration);
 public:
-  CpuCas01Action(Model *model, double cost, bool failed, double speed,
-                 lmm_constraint_t constraint);
-
-  ~CpuCas01Action() {};
+  CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint);
+  ~CpuCas01Action() override;
 };
 
 }