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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 938c39e0ba..b5279e4532 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,19 +1,22 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. 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>
+#ifndef SIMGRID_SURF_CPUCAS01_HPP
+#define SIMGRID_SURF_CPUCAS01_HPP
 
-#include "cpu_interface.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "xbt/base.h"
+
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
 /***********
  * Classes *
  ***********/
 
-namespace simgrid {
-namespace surf {
-
 class XBT_PRIVATE CpuCas01Model;
 class XBT_PRIVATE CpuCas01;
 class XBT_PRIVATE CpuCas01Action;
@@ -22,51 +25,51 @@ class XBT_PRIVATE CpuCas01Action;
  * Model *
  *********/
 
-class CpuCas01Model : public simgrid::surf::CpuModel {
+class CpuCas01Model : public CpuModel {
 public:
-  CpuCas01Model();
-  ~CpuCas01Model() override;
+  explicit CpuCas01Model(const std::string& name);
+  CpuCas01Model(const CpuCas01Model&) = delete;
+  CpuCas01Model& operator=(const CpuCas01Model&) = delete;
 
-  Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
-  ActionList p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+  CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
 };
 
 /************
  * Resource *
  ************/
 
-class CpuCas01 : public Cpu {
+class CpuCas01 : public CpuImpl {
+  std::function<s4u::Host::CpuFactorCb> factor_cb_ = {};
+
 public:
-  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;
+  using CpuImpl::CpuImpl;
+  CpuCas01(const CpuCas01&) = delete;
+  CpuCas01& operator=(const CpuCas01&) = delete;
+  void apply_event(profile::Event* event, double value) override;
+  CpuAction* execution_start(double size, double user_bound) override;
+  CpuAction* execution_start(double size, int requested_cores, double user_bound) override;
   CpuAction* sleep(double duration) override;
-
-  bool isUsed() override;
-
-  std::vector<double> * getSpeedPeakList(); // FIXME: killme to hide our internals
+  void set_factor_cb(const std::function<s4u::Host::CpuFactorCb>& cb) 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, int coreAmount);
-  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint);
-  ~CpuCas01Action() override;
-  int requestedCore();
+class CpuCas01Action : public CpuAction {
+  int requested_core_ = 1;
 
-private:
-  int requestedCore_ = 1;
+public:
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int requested_core);
+  CpuCas01Action(const CpuCas01Action&) = delete;
+  CpuCas01Action& operator=(const CpuCas01Action&) = delete;
+  int requested_core() const { return requested_core_; }
 };
 
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
+
+#endif