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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 6c43dd7619..6309e17c75 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -25,10 +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 speedList, int core) 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;
 };
 
@@ -38,15 +37,16 @@ public:
 
 class CpuCas01 : public Cpu {
 public:
-  CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedList, int core);
-  ~CpuCas01();
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+  ~CpuCas01() override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
   CpuAction *execution_start(double size) override;
+  CpuAction* execution_start(double size, int requestedCore) 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;
@@ -59,10 +59,13 @@ 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(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint, int coreAmount);
+  CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint);
+  ~CpuCas01Action() override;
+  int requestedCore();
 
-  ~CpuCas01Action() {};
+private:
+  int requestedCore_ = 1;
 };
 
 }