X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02fbf5e463830a439464adae8626cd4f2dad27fd..f3da0e53f20a27db79c661314020550b7b9d0bcd:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index bfa4e5362a..7f5c672df0 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,16 +1,33 @@ -/* Copyright (c) 2009-2011, 2013-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2009-2018. 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 "cpu_ti.hpp" -#include "simgrid/sg_config.h" -#include "src/kernel/lmm/maxmin.hpp" -#include +#include "simgrid/sg_config.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 IMPROVED module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module"); + +/*********** + * Options * + ***********/ + +static simgrid::config::Flag + cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy", + + 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) { + xbt_assert(_sg_cfg_init_status < 2, + "Cannot change the optimization algorithm after the initialization"); + }); /********* * Model * @@ -20,56 +37,43 @@ void surf_cpu_model_init_Cas01() xbt_assert(not surf_cpu_model_pm); xbt_assert(not surf_cpu_model_vm); - if (xbt_cfg_get_string("cpu/optim") == "TI") { + if (cpu_optim_opt == "TI") { surf_cpu_model_init_ti(); return; } - surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); + 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(); + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(algo); all_existing_models->push_back(surf_cpu_model_vm); } namespace simgrid { namespace surf { -CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() +CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { - std::string optim = xbt_cfg_get_string("cpu/optim"); - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); - - if (optim == "Full") { - setUpdateMechanism(UM_FULL); - selectiveUpdate_ = select; - } else if (optim == "Lazy") { - setUpdateMechanism(UM_LAZY); - selectiveUpdate_ = true; - xbt_assert(select || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); - } else { - xbt_die("Unsupported optimization (%s) for this model", optim.c_str()); - } - - p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(selectiveUpdate_); + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); - if (getUpdateMechanism() == UM_LAZY) { - modifiedSet_ = new ActionLmmList(); - maxminSystem_->keep_track = modifiedSet_; + 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; } + + set_maxmin_system(new simgrid::kernel::lmm::System(select)); } CpuCas01Model::~CpuCas01Model() { - delete maxminSystem_; - maxminSystem_ = nullptr; - delete modifiedSet_; - surf_cpu_model_pm = nullptr; - - delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) @@ -81,37 +85,30 @@ Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *spe * Resource * ************/ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, + : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, core) { } -CpuCas01::~CpuCas01() -{ - if (model() == surf_cpu_model_pm) - speedPerPstate_.clear(); -} - -std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; -} +CpuCas01::~CpuCas01() = default; -bool CpuCas01::isUsed() +bool CpuCas01::is_used() { - return model()->getMaxminSystem()->constraint_used(constraint()); + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { - lmm_variable_t var = nullptr; - const_lmm_element_t elem = nullptr; + kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Element* elem = nullptr; - model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak); - while ((var = constraint()->get_variable(&elem))) { + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), + get_cores_count() * speed_.scale * speed_.peak); + while ((var = get_constraint()->get_variable(&elem))) { CpuCas01Action* action = static_cast(var->get_id()); - model()->getMaxminSystem()->update_variable_bound(action->getVariable(), - action->requestedCore() * speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), + action->requested_core() * speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -121,40 +118,40 @@ 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_cores_count() == 1, "FIXME: add speed scaling code also for constraint_core[i]"); speed_.scale = value; onSpeedChange(); 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_cores_count() == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { - if(isOff()) - host_that_restart.push_back(getHost()); - turnOn(); + if (is_off()) + host_that_restart.push_back(get_host()); + turn_on(); } else { - lmm_constraint_t cnst = constraint(); - lmm_variable_t var = nullptr; - const_lmm_element_t elem = nullptr; - double date = surf_get_clock(); + kernel::lmm::Constraint* cnst = get_constraint(); + kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Element* elem = nullptr; + double date = surf_get_clock(); - turnOff(); + turn_off(); while ((var = cnst->get_variable(&elem))) { - Action* action = static_cast(var->get_id()); + kernel::resource::Action* action = static_cast(var->get_id()); - if (action->getState() == Action::State::running || - action->getState() == Action::State::ready || - action->getState() == Action::State::not_in_the_system) { - action->setFinishTime(date); - action->setState(Action::State::failed); + 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); } } } - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); @@ -162,13 +159,14 @@ 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) { - return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint()); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint()); } -CpuAction* CpuCas01::execution_start(double size, int requestedCores) + +CpuAction* CpuCas01::execution_start(double size, int requested_cores) { - return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores); } CpuAction *CpuCas01::sleep(double duration) @@ -176,25 +174,21 @@ CpuAction *CpuCas01::sleep(double duration) if (duration > 0) duration = std::max(duration, sg_surf_precision); - XBT_IN("(%s,%g)", getCname(), duration); - CpuCas01Action* action = new CpuCas01Action(model(), 1.0, isOff(), speed_.scale * speed_.peak, constraint()); - - // FIXME: sleep variables should not consume 1.0 in lmm_expand - action->setMaxDuration(duration); - action->suspended_ = 2; - 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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->stateSet_ = static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; - action->getStateSet()->push_back(*action); - } + XBT_IN("(%s,%g)", get_cname(), duration); + CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off(), speed_.scale * speed_.peak, get_constraint()); - model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); - if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap - action->heapRemove(model()->getActionHeap()); + // 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 + 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 + 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 - model()->getModifiedSet()->push_front(*action); + get_model()->get_modified_set()->push_front(*action); } XBT_OUT(); @@ -204,27 +198,26 @@ CpuAction *CpuCas01::sleep(double duration) /********** * Action * **********/ -CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint, - int requestedCore) +CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, + kernel::lmm::Constraint* constraint, int requested_core) : CpuAction(model, cost, failed, - model->getMaxminSystem()->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->getUpdateMechanism() == UM_LAZY) { - refreshLastUpdate(); - setLastValue(0.0); - } - model->getMaxminSystem()->expand(constraint, getVariable(), 1.0); + if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) + set_last_update(); + model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } -CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint) - : CpuCas01Action(model, cost, failed, speed, constraint, 1) +CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, + kernel::lmm::Constraint* constraint) + : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) { } -int CpuCas01Action::requestedCore() +int CpuCas01Action::requested_core() { - return requestedCore_; + return requested_core_; } CpuCas01Action::~CpuCas01Action()=default;