X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4576fd50919e2cffe68e4b86943709f42eaea60f..2f3c9cf811c7c608eb49a3ee14411a887b6a99c8:/src/surf/cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 139c30310a..11cdd36331 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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. */
@@ -11,7 +11,8 @@
  ***********/
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class XBT_PRIVATE CpuCas01Model;
 class XBT_PRIVATE CpuCas01;
@@ -21,12 +22,14 @@ class XBT_PRIVATE CpuCas01Action;
  * Model *
  *********/
 
-class CpuCas01Model : public simgrid::surf::CpuModel {
+class CpuCas01Model : public CpuModel {
 public:
-  explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
+  explicit CpuCas01Model(Model::UpdateAlgo algo);
+  CpuCas01Model(const CpuCas01Model&) = delete;
+  CpuCas01Model& operator=(const CpuCas01Model&) = delete;
   ~CpuCas01Model() override;
 
-  Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+  Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
 };
 
 /************
@@ -35,11 +38,13 @@ public:
 
 class CpuCas01 : public Cpu {
 public:
-  CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+  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(tmgr_trace_event_t event, double value) override;
+  void apply_event(profile::Event* event, double value) override;
   CpuAction* execution_start(double size) override;
-  CpuAction* execution_start(double size, int requestedCore) override;
+  CpuAction* execution_start(double size, int requested_cores) override;
   CpuAction* sleep(double duration) override;
 
   bool is_used() override;
@@ -51,14 +56,15 @@ protected:
 /**********
  * Action *
  **********/
-class CpuCas01Action: public CpuAction {
-  friend CpuAction *CpuCas01::execution_start(double size);
-  friend CpuAction *CpuCas01::sleep(double duration);
+class CpuCas01Action : public CpuAction {
+  friend CpuAction* CpuCas01::execution_start(double size);
+  friend CpuAction* CpuCas01::sleep(double duration);
+
 public:
-  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(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();
 
@@ -66,5 +72,6 @@ private:
   int requested_core_ = 1;
 };
 
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid