X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e4e3ed6a92f699a364dc069b4367e6c72623f18..b59417738c8cf11f1804269c65a4738bbf43c150:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index cc47188652..47b539702a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,14 +1,20 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "cpu_cas01.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" + #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/profile/Event.hpp" +#include "src/surf/cpu_cas01.hpp" +#include "src/surf/cpu_ti.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)"); /*********** * Options * @@ -17,14 +23,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the static simgrid::config::Flag cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy", - std::map({ + std::map>({ {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."}, {"TI", "Trace integration. Highly optimized mode when using availability traces (only available " "for the Cas01 CPU model for now)."}, {"Full", "Full update of remaining and variables. Slow but may be useful when debugging."}, }), - [](std::string const& val) { + [](std::string const&) { xbt_assert(_sg_cfg_init_status < 2, "Cannot change the optimization algorithm after the initialization"); }); @@ -34,132 +40,101 @@ static simgrid::config::Flag *********/ void surf_cpu_model_init_Cas01() { - xbt_assert(not surf_cpu_model_pm); - xbt_assert(not surf_cpu_model_vm); - if (cpu_optim_opt == "TI") { - surf_cpu_model_init_ti(); + simgrid::kernel::resource::CpuTiModel::create_pm_models(); return; } - simgrid::kernel::resource::Model::UpdateAlgo algo; - if (cpu_optim_opt == "Lazy") - algo = simgrid::kernel::resource::Model::UpdateAlgo::Lazy; - else - 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); + auto cpu_model_pm = std::make_shared("Cpu_Cas01"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(cpu_model_pm); + engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { -CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) +CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name) { - bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); + if (config::get_value("cpu/optim") == "Lazy") + set_update_algorithm(Model::UpdateAlgo::LAZY); + + bool select = config::get_value("cpu/maxmin-selective-update"); - if (algo == Model::UpdateAlgo::Lazy) { - xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"), + if (is_update_lazy()) { + xbt_assert(select || config::is_default("cpu/maxmin-selective-update"), "You cannot disable cpu selective update when using the lazy update mechanism"); select = true; } - set_maxmin_system(new simgrid::kernel::lmm::System(select)); + set_maxmin_system(new lmm::System(select)); } -CpuCas01Model::~CpuCas01Model() +CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { - surf_cpu_model_pm = nullptr; -} - -Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) -{ - return new CpuCas01(this, host, speedPerPstate, core); + return (new CpuCas01(host, speed_per_pstate))->set_model(this); } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, - core) -{ -} - -CpuCas01::~CpuCas01() -{ - if (get_model() == surf_cpu_model_pm) - speedPerPstate_.clear(); -} - -std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; -} - -bool CpuCas01::is_used() +bool CpuCas01::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } /** @brief take into account changes of speed (either load or max) */ -void CpuCas01::onSpeedChange() { - kernel::lmm::Variable* var = nullptr; - const kernel::lmm::Element* elem = nullptr; +void CpuCas01::on_speed_change() +{ + const lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), - coresAmount_ * speed_.scale * speed_.peak); - while ((var = get_constraint()->get_variable(&elem))) { - CpuCas01Action* action = static_cast(var->get_id()); + get_core_count() * speed_.scale * speed_.peak); + + while (const auto* var = get_constraint()->get_variable(&elem)) { + const auto* action = static_cast(var->get_id()); + double bound = action->requested_core() * speed_.scale * speed_.peak; + if (action->get_user_bound() > 0) { + bound = std::min(bound, action->get_user_bound()); + } - get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), - action->requestedCore() * speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), bound); } - Cpu::onSpeedChange(); + CpuImpl::on_speed_change(); } -void CpuCas01::apply_event(tmgr_trace_event_t 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] */ - xbt_assert(coresAmount_ == 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_) { - /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); - + } else if (event == state_event_) { if (value > 0) { - if (is_off()) - host_that_restart.push_back(getHost()); - turn_on(); + if (not is_on()) { + XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); + get_iface()->turn_on(); + } } else { - kernel::lmm::Constraint* cnst = get_constraint(); - kernel::lmm::Variable* var = nullptr; - const kernel::lmm::Element* elem = nullptr; + const lmm::Element* elem = nullptr; double date = surf_get_clock(); - turn_off(); + get_iface()->turn_off(); - while ((var = cnst->get_variable(&elem))) { - kernel::resource::Action* action = static_cast(var->get_id()); + while (const auto* var = get_constraint()->get_variable(&elem)) { + Action* action = 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() == 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); } } } - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); @@ -167,36 +142,42 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) } /** @brief Start a new execution on this CPU lasting @param size flops and using one core */ -CpuAction* CpuCas01::execution_start(double size) +CpuAction* CpuCas01::execution_start(double size, double user_bound) { - return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint()); + return execution_start(size, 1, user_bound); } -CpuAction* CpuCas01::execution_start(double size, int requestedCores) +CpuAction* CpuCas01::execution_start(double size, int requested_cores, double user_bound) { - return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requestedCores); + auto* action = + new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(), requested_cores); + action->set_user_bound(user_bound); + if (user_bound > 0 && user_bound < action->get_bound()) { + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), user_bound); + } + if (factor_cb_) { + action->set_rate_factor(factor_cb_(size)); + } + + return action; } -CpuAction *CpuCas01::sleep(double duration) +CpuAction* CpuCas01::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision); XBT_IN("(%s,%g)", get_cname(), duration); - CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off(), speed_.scale * speed_.peak, get_constraint()); + auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint(), 1); // 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); - } + action->set_suspend_state(Action::SuspendStates::SLEEPING); + if (duration == NO_MAX_DURATION) + 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 + get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0); + if (get_model()->is_update_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 @@ -207,34 +188,31 @@ CpuAction *CpuCas01::sleep(double duration) return action; } +void CpuCas01::set_factor_cb(const std::function& cb) +{ + xbt_assert(not is_sealed(), "Cannot set CPU factor callback in an already sealed CPU(%s)", get_cname()); + factor_cb_ = cb; +} + /********** * Action * **********/ -CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint, int requestedCore) +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 / requestedCore, requestedCore * speed, 1)) - , requestedCore_(requestedCore) + 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->is_update_lazy()) set_last_update(); - set_last_value(0.0); - } 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(model, cost, failed, speed, constraint, 1) +int CpuCas01Action::requested_core() const { + return requested_core_; } -int CpuCas01Action::requestedCore() -{ - return requestedCore_; -} - -CpuCas01Action::~CpuCas01Action()=default; - -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid