X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fce09c24b85088743448b2bd504833a3b33937f3..48296e83ce3ba1fa3658a3a74d10a536e33b3849:/src/surf/cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 0656d222d6..94ab188b81 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,18 +1,20 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. 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 "cpu_interface.hpp"
+#ifndef SIMGRID_SURF_CPUCAS01_HPP
+#define SIMGRID_SURF_CPUCAS01_HPP
+
+#include "src/kernel/resource/CpuImpl.hpp"
 #include "xbt/base.h"
 
+namespace simgrid::kernel::resource {
+
 /***********
  * Classes *
  ***********/
 
-namespace simgrid {
-namespace surf {
-
 class XBT_PRIVATE CpuCas01Model;
 class XBT_PRIVATE CpuCas01;
 class XBT_PRIVATE CpuCas01Action;
@@ -21,32 +23,31 @@ class XBT_PRIVATE CpuCas01Action;
  * Model *
  *********/
 
-class CpuCas01Model : public kernel::resource::CpuModel {
+class CpuCas01Model : public CpuModel {
 public:
-  explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
+  explicit CpuCas01Model(const std::string& name);
   CpuCas01Model(const CpuCas01Model&) = delete;
   CpuCas01Model& operator=(const CpuCas01Model&) = delete;
-  ~CpuCas01Model() override;
 
-  kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
+  CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
 };
 
 /************
  * Resource *
  ************/
 
-class CpuCas01 : public kernel::resource::Cpu {
+class CpuCas01 : public CpuImpl {
+  std::function<s4u::Host::CpuFactorCb> factor_cb_ = {};
+
 public:
-  CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+  using CpuImpl::CpuImpl;
   CpuCas01(const CpuCas01&) = delete;
   CpuCas01& operator=(const CpuCas01&) = delete;
-  ~CpuCas01() override;
-  void apply_event(simgrid::kernel::profile::Event* event, double value) override;
-  kernel::resource::CpuAction* execution_start(double size) override;
-  kernel::resource::CpuAction* execution_start(double size, int requested_cores) override;
-  kernel::resource::CpuAction* sleep(double duration) override;
-
-  bool is_used() override;
+  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;
+  void set_factor_cb(const std::function<s4u::Host::CpuFactorCb>& cb) override;
 
 protected:
   void on_speed_change() override;
@@ -55,23 +56,16 @@ protected:
 /**********
  * Action *
  **********/
-class CpuCas01Action : public kernel::resource::CpuAction {
-  friend kernel::resource::CpuAction* CpuCas01::execution_start(double size);
-  friend kernel::resource::CpuAction* CpuCas01::sleep(double duration);
+class CpuCas01Action : public CpuAction {
+  int requested_core_ = 1;
 
 public:
-  CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
-                 kernel::lmm::Constraint* constraint, int core_count);
-  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 requested_core);
   CpuCas01Action(const CpuCas01Action&) = delete;
   CpuCas01Action& operator=(const CpuCas01Action&) = delete;
-  ~CpuCas01Action() override;
-  int requested_core();
-
-private:
-  int requested_core_ = 1;
+  int requested_core() const { return requested_core_; }
 };
 
-}
-}
+} // namespace simgrid::kernel::resource
+
+#endif