cosmetic cleanups in network models

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index fcbdbdd..8451889 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -6,8 +6,8 @@
 #ifndef SURF_MODEL_CPUTI_H_
 #define SURF_MODEL_CPUTI_H_
 
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 #include <boost/intrusive/list.hpp>
 
@@ -73,10 +73,12 @@ private:
  * Action *
  **********/
 
-class XBT_PRIVATE CpuTiAction : public CpuAction {
+class XBT_PRIVATE CpuTiAction : public kernel::resource::CpuAction {
   friend class CpuTi;
 public:
   CpuTiAction(CpuTi* cpu, double cost);
+  CpuTiAction(const CpuTiAction&) = delete;
+  CpuTiAction& operator=(const CpuTiAction&) = delete;
   ~CpuTiAction();
 
   void set_state(kernel::resource::Action::State state) override;
@@ -98,9 +100,11 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
 /************
  * Resource *
  ************/
-class CpuTi : public Cpu {
+class CpuTi : public kernel::resource::Cpu {
 public:
-  CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
+  CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+  CpuTi(const CpuTi&)            = delete;
+  CpuTi& operator&(const CpuTi&) = delete;
   ~CpuTi() override;
 
   void set_speed_profile(kernel::profile::Profile* profile) override;
@@ -110,13 +114,13 @@ public:
   void update_remaining_amount(double now);
 
   bool is_used() override;
-  CpuAction *execution_start(double size) override;
+  kernel::resource::CpuAction* execution_start(double size) override;
   kernel::resource::Action* execution_start(double, int) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
   }
-  CpuAction *sleep(double duration) override;
+  kernel::resource::CpuAction* sleep(double duration) override;
   double get_speed_ratio() override;
 
   void set_modified(bool modified);
@@ -135,20 +139,22 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
 /*********
  * Model *
  *********/
-class CpuTiModel : public CpuModel {
+class CpuTiModel : public kernel::resource::CpuModel {
 public:
   static void create_pm_vm_models(); // Make both models be TI models
 
   CpuTiModel();
+  CpuTiModel(const CpuTiModel&) = delete;
+  CpuTiModel& operator=(const CpuTiModel&) = delete;
   ~CpuTiModel() override;
-  Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+  kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 
   CpuTiList modified_cpus_;
 };
 
-}
-}
+} // namespace surf
+} // namespace simgrid
 
 #endif /* SURF_MODEL_CPUTI_H_ */