X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6bffab333103f7f6c28905966b69889ae32b2d0f..fe06d3ceaa02056b708bb777ed9973df6744f776:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 57eb37e1bd..a39c9b3a83 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -5,6 +5,7 @@ #include "cpu_cas01.hpp" #include "simgrid/sg_config.hpp" +#include "src/surf/cpu_ti.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -34,25 +35,22 @@ static simgrid::config::Flag *********/ void surf_cpu_model_init_Cas01() { - xbt_assert(not surf_cpu_model_pm); - xbt_assert(not surf_cpu_model_vm); + 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."); if (cpu_optim_opt == "TI") { - surf_cpu_model_init_ti(); + simgrid::surf::CpuTiModel::create_pm_vm_models(); return; } simgrid::kernel::resource::Model::UpdateAlgo algo; if (cpu_optim_opt == "Lazy") - algo = simgrid::kernel::resource::Model::UpdateAlgo::Lazy; + algo = simgrid::kernel::resource::Model::UpdateAlgo::LAZY; else - algo = simgrid::kernel::resource::Model::UpdateAlgo::Full; + algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL; surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo); - all_existing_models->push_back(surf_cpu_model_pm); - surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(algo); - all_existing_models->push_back(surf_cpu_model_vm); } namespace simgrid { @@ -60,9 +58,11 @@ namespace surf { CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { + all_existing_models.push_back(this); + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); - if (algo == Model::UpdateAlgo::Lazy) { + if (algo == Model::UpdateAlgo::LAZY) { xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"), "You cannot disable cpu selective update when using the lazy update mechanism"); select = true; @@ -76,9 +76,9 @@ CpuCas01Model::~CpuCas01Model() surf_cpu_model_pm = nullptr; } -Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) +Cpu* CpuCas01Model::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) { - return new CpuCas01(this, host, speedPerPstate, core); + return new CpuCas01(this, host, speed_per_pstate, core); } /************ @@ -90,15 +90,7 @@ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; -} +CpuCas01::~CpuCas01() = default; bool CpuCas01::is_used() { @@ -106,12 +98,13 @@ bool CpuCas01::is_used() } /** @brief take into account changes of speed (either load or max) */ -void CpuCas01::onSpeedChange() { +void CpuCas01::on_speed_change() +{ kernel::lmm::Variable* var = nullptr; const kernel::lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), - coresAmount_ * speed_.scale * speed_.peak); + get_core_count() * speed_.scale * speed_.peak); while ((var = get_constraint()->get_variable(&elem))) { CpuCas01Action* action = static_cast(var->get_id()); @@ -119,26 +112,26 @@ void CpuCas01::onSpeedChange() { action->requested_core() * speed_.scale * speed_.peak); } - Cpu::onSpeedChange(); + Cpu::on_speed_change(); } void CpuCas01::apply_event(tmgr_trace_event_t event, double value) { if (event == speed_.event) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(coresAmount_ == 1, "FIXME: add speed scaling code also for constraint_core[i]"); + xbt_assert(get_core_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]"); speed_.scale = value; - onSpeedChange(); + on_speed_change(); tmgr_trace_event_unref(&speed_.event); - } else if (event == stateEvent_) { + } else if (event == state_event_) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); + xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { if (is_off()) - host_that_restart.push_back(getHost()); + host_that_restart.push_back(get_host()); turn_on(); } else { kernel::lmm::Constraint* cnst = get_constraint(); @@ -151,15 +144,15 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) while ((var = cnst->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); - if (action->get_state() == kernel::resource::Action::State::running || - action->get_state() == kernel::resource::Action::State::ready || - action->get_state() == kernel::resource::Action::State::not_in_the_system) { + 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) { action->set_finish_time(date); - action->set_state(kernel::resource::Action::State::failed); + action->set_state(kernel::resource::Action::State::FAILED); } } } - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); @@ -188,15 +181,11 @@ CpuAction *CpuCas01::sleep(double duration) // FIXME: sleep variables should not consume 1.0 in System::expand() action->set_max_duration(duration); action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; - if (duration < 0) { // NO_MAX_DURATION - /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */ - simgrid::xbt::intrusive_erase(*action->get_state_set(), *action); - action->state_set_ = &static_cast(get_model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_; - action->get_state_set()->push_back(*action); - } + if (duration < 0) // NO_MAX_DURATION + action->set_state(simgrid::kernel::resource::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() == kernel::resource::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 @@ -216,7 +205,7 @@ CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool 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() == kernel::resource::Model::UpdateAlgo::LAZY) set_last_update(); model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); }