X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..5b542ab50095428450e36bb4bed15df852b78290:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 096151013d..6997bfe5b3 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -100,12 +100,12 @@ using ActionTiList = boost::intrusive::list; ************/ class CpuTi : public Cpu { public: - CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); + CpuTi(s4u::Host* host, const std::vector& speed_per_pstate); CpuTi(const CpuTi&) = delete; CpuTi& operator&(const CpuTi&) = delete; ~CpuTi() override; - void set_speed_profile(profile::Profile* profile) override; + Cpu* set_speed_profile(profile::Profile* profile) override; void apply_event(profile::Event* event, double value) override; void update_actions_finish_time(double now); @@ -140,13 +140,12 @@ using CpuTiList = boost::intrusive::list; *********/ class CpuTiModel : public CpuModel { public: - static void create_pm_vm_models(); // Make both models be TI models + static void create_pm_models(); // Make CPU PM model - CpuTiModel(); + using CpuModel::CpuModel; CpuTiModel(const CpuTiModel&) = delete; CpuTiModel& operator=(const CpuTiModel&) = delete; - ~CpuTiModel() override; - Cpu* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) override; + Cpu* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) override; double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override;