From: Frederic Suter Date: Fri, 12 Apr 2019 12:34:36 +0000 (+0200) Subject: move CPU models to kernel::resource too X-Git-Tag: v3.22.2~141 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fdab189916cad1bf47afa4f3c272c8ba26c36ed1?hp=7e25358c2182b71a87fcd4628c4b614826d9dd30 move CPU models to kernel::resource too --- diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 0301e4553c..1bb85a7711 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -39,7 +39,7 @@ void surf_cpu_model_init_Cas01() xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen."); if (cpu_optim_opt == "TI") { - simgrid::surf::CpuTiModel::create_pm_vm_models(); + simgrid::kernel::resource::CpuTiModel::create_pm_vm_models(); return; } @@ -49,14 +49,15 @@ void surf_cpu_model_init_Cas01() else algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL; - surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo); - surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(algo); + surf_cpu_model_pm = new simgrid::kernel::resource::CpuCas01Model(algo); + surf_cpu_model_vm = new simgrid::kernel::resource::CpuCas01Model(algo); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { -CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : kernel::resource::CpuModel(algo) +CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo) { all_existing_models.push_back(this); @@ -68,7 +69,7 @@ CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : kernel: select = true; } - set_maxmin_system(new kernel::lmm::System(select)); + set_maxmin_system(new lmm::System(select)); } CpuCas01Model::~CpuCas01Model() @@ -76,7 +77,7 @@ CpuCas01Model::~CpuCas01Model() surf_cpu_model_pm = nullptr; } -kernel::resource::Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) +Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) { return new CpuCas01(this, host, speed_per_pstate, core); } @@ -100,8 +101,8 @@ bool CpuCas01::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::on_speed_change() { - kernel::lmm::Variable* var = nullptr; - const kernel::lmm::Element* elem = nullptr; + lmm::Variable* var = nullptr; + const lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_core_count() * speed_.scale * speed_.peak); @@ -115,7 +116,7 @@ void CpuCas01::on_speed_change() Cpu::on_speed_change(); } -void CpuCas01::apply_event(kernel::profile::Event* event, double value) +void CpuCas01::apply_event(profile::Event* event, double value) { if (event == speed_.event) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ @@ -135,21 +136,20 @@ void CpuCas01::apply_event(kernel::profile::Event* event, double value) get_host()->turn_on(); } } else { - kernel::lmm::Constraint* cnst = get_constraint(); - kernel::lmm::Variable* var = nullptr; - const kernel::lmm::Element* elem = nullptr; + lmm::Constraint* cnst = get_constraint(); + lmm::Variable* var = nullptr; + const lmm::Element* elem = nullptr; double date = surf_get_clock(); get_host()->turn_off(); while ((var = cnst->get_variable(&elem))) { - kernel::resource::Action* action = static_cast(var->get_id()); + Action* action = static_cast(var->get_id()); - if (action->get_state() == kernel::resource::Action::State::INITED || - action->get_state() == kernel::resource::Action::State::STARTED || - action->get_state() == kernel::resource::Action::State::IGNORED) { + if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED || + action->get_state() == Action::State::IGNORED) { action->set_finish_time(date); - action->set_state(kernel::resource::Action::State::FAILED); + action->set_state(Action::State::FAILED); } } } @@ -161,18 +161,18 @@ void CpuCas01::apply_event(kernel::profile::Event* event, double value) } /** @brief Start a new execution on this CPU lasting @param size flops and using one core */ -kernel::resource::CpuAction* CpuCas01::execution_start(double size) +CpuAction* CpuCas01::execution_start(double size) { return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint()); } -kernel::resource::CpuAction* CpuCas01::execution_start(double size, int requested_cores) +CpuAction* CpuCas01::execution_start(double size, int requested_cores) { return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(), requested_cores); } -kernel::resource::CpuAction* CpuCas01::sleep(double duration) +CpuAction* CpuCas01::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision); @@ -183,12 +183,12 @@ kernel::resource::CpuAction* CpuCas01::sleep(double duration) // FIXME: sleep variables should not consume 1.0 in System::expand() action->set_max_duration(duration); - action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING); + action->set_suspend_state(Action::SuspendStates::SLEEPING); if (duration == NO_MAX_DURATION) - action->set_state(simgrid::kernel::resource::Action::State::IGNORED); + action->set_state(Action::State::IGNORED); get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); - if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::LAZY) { // remove action from the heap + if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) { // remove action from the heap get_model()->get_action_heap().remove(action); // this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its // max_duration correctly at the next call to share_resources @@ -202,19 +202,18 @@ kernel::resource::CpuAction* CpuCas01::sleep(double duration) /********** * Action * **********/ -CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint, int requested_core) +CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, + int requested_core) : CpuAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1)) , requested_core_(requested_core) { - if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::LAZY) + if (model->get_update_algorithm() == Model::UpdateAlgo::LAZY) set_last_update(); model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } -CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint) +CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint) : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) { } @@ -226,5 +225,6 @@ int CpuCas01Action::requested_core() CpuCas01Action::~CpuCas01Action()=default; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index 0656d222d6..11cdd36331 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -11,7 +11,8 @@ ***********/ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { class XBT_PRIVATE CpuCas01Model; class XBT_PRIVATE CpuCas01; @@ -21,30 +22,30 @@ class XBT_PRIVATE CpuCas01Action; * Model * *********/ -class CpuCas01Model : public kernel::resource::CpuModel { +class CpuCas01Model : public CpuModel { public: - explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo); + explicit CpuCas01Model(Model::UpdateAlgo algo); CpuCas01Model(const CpuCas01Model&) = delete; CpuCas01Model& operator=(const CpuCas01Model&) = delete; ~CpuCas01Model() override; - kernel::resource::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, int core) override; }; /************ * Resource * ************/ -class CpuCas01 : public kernel::resource::Cpu { +class CpuCas01 : public Cpu { public: - CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, const std::vector& speed_per_pstate, int core); + CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); CpuCas01(const CpuCas01&) = delete; CpuCas01& operator=(const CpuCas01&) = delete; ~CpuCas01() override; - void apply_event(simgrid::kernel::profile::Event* event, double value) override; - kernel::resource::CpuAction* execution_start(double size) override; - kernel::resource::CpuAction* execution_start(double size, int requested_cores) override; - kernel::resource::CpuAction* sleep(double duration) 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; @@ -55,15 +56,13 @@ protected: /********** * Action * **********/ -class CpuCas01Action : public kernel::resource::CpuAction { - friend kernel::resource::CpuAction* CpuCas01::execution_start(double size); - friend kernel::resource::CpuAction* CpuCas01::sleep(double duration); +class CpuCas01Action : public CpuAction { + friend CpuAction* CpuCas01::execution_start(double size); + friend CpuAction* CpuCas01::sleep(double duration); public: - CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint, int core_count); - CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint); + 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(const CpuCas01Action&) = delete; CpuCas01Action& operator=(const CpuCas01Action&) = delete; ~CpuCas01Action() override; @@ -73,5 +72,6 @@ private: int requested_core_ = 1; }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index fe41d41ded..46872d2340 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -13,13 +13,14 @@ constexpr double EPSILON = 0.000000001; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module"); namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Trace * *********/ -CpuTiProfile::CpuTiProfile(kernel::profile::Profile* profile) +CpuTiProfile::CpuTiProfile(profile::Profile* profile) { double integral = 0; double time = 0; @@ -284,22 +285,17 @@ int CpuTiProfile::binary_search(double* array, double a, int low, int high) return low; } -} -} - /********* * Model * *********/ -namespace simgrid { -namespace surf { void CpuTiModel::create_pm_vm_models() { xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen."); xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen."); - surf_cpu_model_pm = new simgrid::surf::CpuTiModel(); - surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); + surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel(); + surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel(); } CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL) @@ -666,5 +662,6 @@ double CpuTiAction::get_remains() return get_remains_no_update(); } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 845188984a..fa3a3e83fc 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -12,7 +12,8 @@ #include namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /*********** * Classes * @@ -25,7 +26,7 @@ class XBT_PRIVATE CpuTi; *********/ class CpuTiProfile { public: - explicit CpuTiProfile(kernel::profile::Profile* profile); + explicit CpuTiProfile(profile::Profile* profile); CpuTiProfile(const CpuTiProfile&) = delete; CpuTiProfile& operator=(const CpuTiProfile&) = delete; ~CpuTiProfile(); @@ -48,7 +49,7 @@ class CpuTiTmgr { public: explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){}; - CpuTiTmgr(kernel::profile::Profile* speed_profile, double value); + CpuTiTmgr(profile::Profile* speed_profile, double value); CpuTiTmgr(const CpuTiTmgr&) = delete; CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; ~CpuTiTmgr(); @@ -66,14 +67,14 @@ private: double total_ = 0.0; /*< Integral total between 0 and last_pointn */ CpuTiProfile* profile_ = nullptr; - kernel::profile::Profile* speed_profile_ = nullptr; + profile::Profile* speed_profile_ = nullptr; }; /********** * Action * **********/ -class XBT_PRIVATE CpuTiAction : public kernel::resource::CpuAction { +class XBT_PRIVATE CpuTiAction : public CpuAction { friend class CpuTi; public: CpuTiAction(CpuTi* cpu, double cost); @@ -81,7 +82,7 @@ public: CpuTiAction& operator=(const CpuTiAction&) = delete; ~CpuTiAction(); - void set_state(kernel::resource::Action::State state) override; + void set_state(Action::State state) override; void cancel() override; void suspend() override; void resume() override; @@ -100,27 +101,27 @@ typedef boost::intrusive::list ActionTiList; /************ * Resource * ************/ -class CpuTi : public kernel::resource::Cpu { +class CpuTi : public Cpu { public: CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector& 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; + void set_speed_profile(profile::Profile* profile) override; - void apply_event(kernel::profile::Event* event, double value) override; + void apply_event(profile::Event* event, double value) override; void update_actions_finish_time(double now); void update_remaining_amount(double now); bool is_used() override; - kernel::resource::CpuAction* execution_start(double size) override; - kernel::resource::Action* execution_start(double, int) override + CpuAction* execution_start(double size) override; + Action* execution_start(double, int) override { THROW_UNIMPLEMENTED; return nullptr; } - kernel::resource::CpuAction* sleep(double duration) override; + CpuAction* sleep(double duration) override; double get_speed_ratio() override; void set_modified(bool modified); @@ -139,7 +140,7 @@ typedef boost::intrusive::list CpuTiList; /********* * Model * *********/ -class CpuTiModel : public kernel::resource::CpuModel { +class CpuTiModel : public CpuModel { public: static void create_pm_vm_models(); // Make both models be TI models @@ -147,14 +148,15 @@ public: CpuTiModel(const CpuTiModel&) = delete; CpuTiModel& operator=(const CpuTiModel&) = delete; ~CpuTiModel() override; - kernel::resource::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, 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 resource +} // namespace kernel } // namespace simgrid #endif /* SURF_MODEL_CPUTI_H_ */