X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/387f0d33929229d58e854595762a9951d880b9fb..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 4f105a58ee..a82c95663c 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,16 +1,13 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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.hpp" -#include "src/kernel/lmm/maxmin.hpp" -#include "xbt/config.hpp" -#include "xbt/utility.hpp" - -#include +#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"); @@ -28,7 +25,7 @@ static simgrid::config::Flag {"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"); }); @@ -38,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 { @@ -64,10 +58,12 @@ namespace surf { CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + all_existing_models.push_back(this); + + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); - if (algo == Model::UpdateAlgo::Lazy) { - xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"), + 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; } @@ -80,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); } /************ @@ -94,75 +90,70 @@ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; -} +CpuCas01::~CpuCas01() = default; bool CpuCas01::is_used() { - return model()->get_maxmin_system()->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() { +void CpuCas01::on_speed_change() +{ kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; - model()->get_maxmin_system()->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_core_count() * speed_.scale * speed_.peak); + while ((var = get_constraint()->get_variable(&elem))) { CpuCas01Action* action = static_cast(var->get_id()); - 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(), + action->requested_core() * speed_.scale * speed_.peak); } - Cpu::onSpeedChange(); + Cpu::on_speed_change(); } -void CpuCas01::apply_event(tmgr_trace_event_t event, double value) +void CpuCas01::apply_event(kernel::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]"); + 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(isOff()) - host_that_restart.push_back(getHost()); - turnOn(); + if (not is_on()) { + XBT_VERB("Restart processes on host %s", get_host()->get_cname()); + get_host()->turn_on(); + } } else { - kernel::lmm::Constraint* cnst = constraint(); + kernel::lmm::Constraint* cnst = get_constraint(); kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; double date = surf_get_clock(); - turnOff(); + get_host()->turn_off(); 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"); @@ -172,38 +163,36 @@ 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) { - return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint()); + return new CpuCas01Action(get_model(), size, not is_on(), 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, not is_on(), speed_.scale * speed_.peak, get_constraint(), + requested_cores); } -CpuAction *CpuCas01::sleep(double duration) +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()); + XBT_IN("(%s,%g)", get_cname(), duration); + CpuCas01Action* action = + new CpuCas01Action(get_model(), 1.0, not is_on(), 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 - /* 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(model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_; - action->get_state_set()->push_back(*action); - } + if (duration == NO_MAX_DURATION) + action->set_state(simgrid::kernel::resource::Action::State::IGNORED); - model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); - if (model()->getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap - action->heapRemove(); + 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()->get_modified_set()->push_front(*action); + get_model()->get_modified_set()->push_front(*action); } XBT_OUT(); @@ -214,27 +203,25 @@ CpuAction *CpuCas01::sleep(double duration) * Action * **********/ CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint, int requestedCore) + kernel::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->getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) { + if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::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) + : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) { } -int CpuCas01Action::requestedCore() +int CpuCas01Action::requested_core() { - return requestedCore_; + return requested_core_; } CpuCas01Action::~CpuCas01Action()=default;