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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index f0f586431f..f01f62bc64 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,18 +1,18 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2020. 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 *
  ***********/
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class XBT_PRIVATE CpuCas01Model;
 class XBT_PRIVATE CpuCas01;
@@ -22,15 +22,14 @@ class XBT_PRIVATE CpuCas01Action;
  * Model *
  *********/
 
-class CpuCas01Model : public simgrid::surf::CpuModel {
+class CpuCas01Model : public CpuModel {
 public:
-  CpuCas01Model();
-  ~CpuCas01Model();
+  explicit CpuCas01Model(Model::UpdateAlgo algo);
+  CpuCas01Model(const CpuCas01Model&) = delete;
+  CpuCas01Model& operator=(const CpuCas01Model&) = delete;
+  ~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;
-  ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+  Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
 };
 
 /************
@@ -39,33 +38,40 @@ 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();
-  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, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+  CpuCas01(const CpuCas01&) = delete;
+  CpuCas01& operator=(const CpuCas01&) = delete;
+  ~CpuCas01() override;
+  void apply_event(profile::Event* event, double value) override;
+  CpuAction* execution_start(double size) override;
+  CpuAction* execution_start(double size, int requested_cores) override;
+  CpuAction* sleep(double duration) override;
 
-  xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
+  bool is_used() override;
 
 protected:
-  void onSpeedChange() override;
+  void on_speed_change() override;
 };
 
 /**********
  * Action *
  **********/
-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);
+class CpuCas01Action : public CpuAction {
+  friend CpuAction* CpuCas01::execution_start(double size);
+  friend CpuAction* CpuCas01::sleep(double duration);
 
-  ~CpuCas01Action() {};
+public:
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int core_count);
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint);
+  CpuCas01Action(const CpuCas01Action&) = delete;
+  CpuCas01Action& operator=(const CpuCas01Action&) = delete;
+  ~CpuCas01Action() override;
+  int requested_core();
+
+private:
+  int requested_core_ = 1;
 };
 
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid