make k:r:Cpu::speed_per_pstate_ private as it should

[simgrid.git] / src / surf / cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index d2022aa..da01315 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/base.h>
-
 #include "cpu_interface.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *
@@ -24,16 +23,10 @@ class XBT_PRIVATE CpuCas01Action;
 
 class CpuCas01Model : public simgrid::surf::CpuModel {
 public:
-  CpuCas01Model();
-  ~CpuCas01Model();
+  explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
+  ~CpuCas01Model() override;
 
-  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;
-  double next_occuring_event_full(double now) override;
-  ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+  Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
 };
 
 /************
@@ -42,17 +35,14 @@ public:
 
 class CpuCas01 : public Cpu {
 public:
-  CpuCas01(CpuCas01Model *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) ;
-  ~CpuCas01();
-  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;
+  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;
 
-  xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
+  bool is_used() override;
 
 protected:
   void onSpeedChange() override;
@@ -65,10 +55,15 @@ 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(kernel::resource::Model* model, double cost, bool failed, double speed,
+                 kernel::lmm::Constraint* constraint, int coreAmount);
+  CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+                 kernel::lmm::Constraint* constraint);
+  ~CpuCas01Action() override;
+  int requested_core();
+
+private:
+  int requested_core_ = 1;
 };
 
 }