Avoid using surf_network_model global

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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index f01f62bc6445685750d64ffd4d9577804abd7bd9..7ef6cec921d83480683fb63e4f37ba0e9542c9e7 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,8 +1,11 @@
-/* Copyright (c) 2013-2020. 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. */
 
+#ifndef SIMGRID_SURF_CPUCAS01_HPP
+#define SIMGRID_SURF_CPUCAS01_HPP
+
 #include "cpu_interface.hpp"
 #include "xbt/base.h"
 
@@ -29,7 +32,7 @@ public:
   CpuCas01Model& operator=(const CpuCas01Model&) = delete;
   ~CpuCas01Model() override;
 
-  Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
+  Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
 };
 
 /************
@@ -38,16 +41,15 @@ public:
 
 class CpuCas01 : public Cpu {
 public:
-  CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+  CpuCas01(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu(host, speed_per_pstate) {}
   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;
 
-  bool is_used() override;
+  bool is_used() const override;
 
 protected:
   void on_speed_change() override;
@@ -61,12 +63,12 @@ class CpuCas01Action : public CpuAction {
   friend CpuAction* CpuCas01::sleep(double duration);
 
 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(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint,
+                 int requested_core = 1);
   CpuCas01Action(const CpuCas01Action&) = delete;
   CpuCas01Action& operator=(const CpuCas01Action&) = delete;
   ~CpuCas01Action() override;
-  int requested_core();
+  int requested_core() const;
 
 private:
   int requested_core_ = 1;
@@ -75,3 +77,5 @@ private:
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid
+
+#endif