X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71cecd7bcda32076656fc615784a1146c910b6b5..eefc25aa1c98cbb7458cbf5d38007470e3bef7d0:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index cb11f06f61..4d6329f18a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,78 +1,79 @@ -/* Copyright (c) 2009-2011, 2013-2016. 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 "maxmin_private.hpp" -#include "simgrid/sg_config.h" +#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 * *********/ void surf_cpu_model_init_Cas01() { - xbt_assert(!surf_cpu_model_pm); - xbt_assert(!surf_cpu_model_vm); + xbt_assert(not surf_cpu_model_pm); + xbt_assert(not surf_cpu_model_vm); - char *optim = xbt_cfg_get_string("cpu/optim"); - if (!strcmp(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) { - char *optim = xbt_cfg_get_string("cpu/optim"); - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); - - if (!strcmp(optim, "Full")) { - updateMechanism_ = UM_FULL; - selectiveUpdate_ = select; - } else if (!strcmp(optim, "Lazy")) { - updateMechanism_ = 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); - } + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); - p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - maxminSystem_ = lmm_system_new(selectiveUpdate_); - - if (getUpdateMechanism() == UM_LAZY) { - actionHeap_ = xbt_heap_new(8, nullptr); - xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); - 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() { - lmm_system_free(maxminSystem_); - maxminSystem_ = nullptr; - xbt_heap_free(actionHeap_); - delete modifiedSet_; - surf_cpu_model_pm = nullptr; - - delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) @@ -83,116 +84,119 @@ 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, lmm_constraint_new(model->getMaxminSystem(), this, core * speedPerPstate->front()), - speedPerPstate, core) +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 (getModel() == surf_cpu_model_pm) - speedPerPstate_.clear(); + if (get_model() == surf_cpu_model_pm) + speed_per_pstate_.clear(); } std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; + return &speed_per_pstate_; } -bool CpuCas01::isUsed() +bool CpuCas01::is_used() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + 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; - lmm_element_t elem = nullptr; + kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Element* elem = nullptr; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), - coresAmount_ * speed_.scale * speed_.peak); - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01Action *action = static_cast(lmm_variable_id(var)); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), + cores_count_ * speed_.scale * speed_.peak); + while ((var = get_constraint()->get_variable(&elem))) { + CpuCas01Action* action = static_cast(var->get_id()); - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); - } + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), + action->requested_core() * speed_.scale * speed_.peak); + } Cpu::onSpeedChange(); } -void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) +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(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(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 = getConstraint(); - lmm_variable_t var = nullptr; - 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 = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { - Action *action = static_cast(lmm_variable_id(var)); + while ((var = cnst->get_variable(&elem))) { + 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"); } } -CpuAction *CpuCas01::execution_start(double size) +/** @brief Start a new execution on this CPU lasting @param size flops and using one core */ +CpuAction* CpuCas01::execution_start(double size) { - return new CpuCas01Action(getModel(), size, isOff(), speed_.scale * speed_.peak, getConstraint()); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint()); +} + +CpuAction* CpuCas01::execution_start(double size, int requested_cores) +{ + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores); } CpuAction *CpuCas01::sleep(double duration) { if (duration > 0) - duration = MAX(duration, sg_surf_precision); - - XBT_IN("(%s,%g)", getName(), duration); - CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(), speed_.scale * speed_.peak, getConstraint()); - - // FIXME: sleep variables should not consume 1.0 in lmm_expand - action->maxDuration_ = duration; - action->suspended_ = 2; - if (duration == 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(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; - action->getStateSet()->push_back(*action); - } + 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()); + + // 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); - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); - if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap - action->heapRemove(getModel()->getActionHeap()); + 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 - getModel()->getModifiedSet()->push_front(*action); + get_model()->get_modified_set()->push_front(*action); } XBT_OUT(); @@ -202,16 +206,26 @@ 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) + : 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) + 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) - : CpuAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, speed, 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) { - if (model->getUpdateMechanism() == UM_LAZY) { - indexHeap_ = -1; - lastUpdate_ = surf_get_clock(); - lastValue_ = 0.0; - } - lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); +} + +int CpuCas01Action::requested_core() +{ + return requested_core_; } CpuCas01Action::~CpuCas01Action()=default;