X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f91c36f2d8b3bbd5c936bc9caa7e02d758b3f726..eecf563b3a3a0333dac9f754fe11f047c99cd27d:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 213ec2e655..b069dc9930 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -4,13 +4,9 @@ * 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/surf_interface.hpp" +#include "surf/surf.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module"); @@ -64,10 +60,10 @@ namespace surf { CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + 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"), + 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; } @@ -96,7 +92,7 @@ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector * CpuCas01::getSpeedPeakList(){ 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() { 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(), + coresAmount_ * 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(); @@ -140,25 +137,25 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { - if(isOff()) + if (is_off()) host_that_restart.push_back(getHost()); - turnOn(); + 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(); + 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); } } } @@ -172,12 +169,12 @@ 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, 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) @@ -185,25 +182,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()); + 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 - /* 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 < 0) // 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()->get_update_algorithm() == 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 +207,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->get_update_algorithm() == 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;