X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8301d2fc929ad1ce873e4de1e97540827cdd940a..15479dbe435febdbec7411e8de9b11bac1ca9350:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 61c94fa5f5..7ad6573b60 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -6,10 +6,11 @@ #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ -#include "src/kernel/resource/profile/trace_mgr.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/cpu_interface.hpp" #include +#include namespace simgrid { namespace kernel { @@ -48,7 +49,6 @@ public: CpuTiTmgr(profile::Profile* speed_profile, double value); CpuTiTmgr(const CpuTiTmgr&) = delete; CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; - ~CpuTiTmgr(); double integrate(double a, double b); double solve(double a, double amount); @@ -62,8 +62,8 @@ private: double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ double total_ = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiProfile* profile_ = nullptr; - profile::Profile* speed_profile_ = nullptr; + std::unique_ptr profile_ = nullptr; + profile::Profile* speed_profile_ = nullptr; }; /********** @@ -83,7 +83,7 @@ public: void suspend() override; void resume() override; void set_max_duration(double duration) override; - void set_priority(double priority) override; + void set_sharing_penalty(double sharing_penalty) override; double get_remains() override; CpuTi *cpu_; @@ -112,7 +112,7 @@ public: bool is_used() override; CpuAction* execution_start(double size) override; - Action* execution_start(double, int) override + CpuAction* execution_start(double, int) override { THROW_UNIMPLEMENTED; return nullptr;