X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d08efd41a22b0813a99a3c206152d2edcbf3f00..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 2a4435b800..2b3dff1f50 100644 --- 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 @@ -77,6 +77,8 @@ class XBT_PRIVATE CpuTiAction : public 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; @@ -101,9 +103,11 @@ typedef boost::intrusive::list ActionTiList; class CpuTi : public Cpu { public: CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuTi(const CpuTi&) = delete; + CpuTi& operator&(const CpuTi&) = delete; ~CpuTi() override; - void set_speed_trace(kernel::profile::Profile* profile) override; + void set_speed_profile(kernel::profile::Profile* profile) override; void apply_event(kernel::profile::Event* event, double value) override; void update_actions_finish_time(double now); @@ -111,7 +115,7 @@ public: bool is_used() override; CpuAction *execution_start(double size) override; - kernel::resource::Action* execution_start(double size, int requested_cores) override + kernel::resource::Action* execution_start(double, int) override { THROW_UNIMPLEMENTED; return nullptr; @@ -140,6 +144,8 @@ 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* speed_per_pstate, int core) override; double next_occuring_event(double now) override;