Misc code simplifications guided by Sonar smells.

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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 61b588b..ec8de09 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. 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. */
@@ -6,17 +6,17 @@
 #ifndef SIMGRID_SURF_CPUCAS01_HPP
 #define SIMGRID_SURF_CPUCAS01_HPP
 
-#include "cpu_interface.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
 #include "xbt/base.h"
 
-/***********
- * Classes *
- ***********/
-
 namespace simgrid {
 namespace kernel {
 namespace resource {
 
+/***********
+ * Classes *
+ ***********/
+
 class XBT_PRIVATE CpuCas01Model;
 class XBT_PRIVATE CpuCas01;
 class XBT_PRIVATE CpuCas01Action;
@@ -39,6 +39,8 @@ public:
  ************/
 
 class CpuCas01 : public CpuImpl {
+  std::function<s4u::Host::CpuFactorCb> factor_cb_ = {};
+
 public:
   using CpuImpl::CpuImpl;
   CpuCas01(const CpuCas01&) = delete;
@@ -47,8 +49,7 @@ public:
   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 is_used() const override;
+  void set_factor_cb(const std::function<s4u::Host::CpuFactorCb>& cb) override;
 
 protected:
   void on_speed_change() override;
@@ -58,14 +59,13 @@ protected:
  * Action *
  **********/
 class CpuCas01Action : public CpuAction {
+  int requested_core_ = 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;
-
-private:
-  int requested_core_ = 1;
+  int requested_core() const { return requested_core_; }
 };
 
 } // namespace resource