X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff25d0379ffdbee9ddbd8f0d1ab6931de25b420a..627cef048b8d7a523fa6d2ccaec750eccb0468e9:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index bfa4e5362a..477e392809 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,5 +1,4 @@ -/* 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. */ @@ -8,6 +7,7 @@ #include "cpu_ti.hpp" #include "simgrid/sg_config.h" #include "src/kernel/lmm/maxmin.hpp" +#include "xbt/utility.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); @@ -42,34 +42,24 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() if (optim == "Full") { setUpdateMechanism(UM_FULL); - selectiveUpdate_ = select; } else if (optim == "Lazy") { setUpdateMechanism(UM_LAZY); - selectiveUpdate_ = true; + select = 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_); + maxmin_system_ = new simgrid::kernel::lmm::System(select); - if (getUpdateMechanism() == UM_LAZY) { - modifiedSet_ = new ActionLmmList(); - maxminSystem_->keep_track = modifiedSet_; - } + if (getUpdateMechanism() == UM_LAZY) + maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet(); } 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) @@ -103,14 +93,14 @@ bool CpuCas01::isUsed() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; const_lmm_element_t elem = nullptr; model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak); while ((var = constraint()->get_variable(&elem))) { CpuCas01Action* action = static_cast(var->get_id()); - model()->getMaxminSystem()->update_variable_bound(action->getVariable(), + model()->getMaxminSystem()->update_variable_bound(action->get_variable(), action->requestedCore() * speed_.scale * speed_.peak); } @@ -136,21 +126,21 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) host_that_restart.push_back(getHost()); turnOn(); } else { - lmm_constraint_t cnst = constraint(); - lmm_variable_t var = nullptr; + kernel::lmm::Constraint* cnst = constraint(); + kernel::lmm::Variable* var = nullptr; const_lmm_element_t elem = nullptr; - double date = surf_get_clock(); + double date = surf_get_clock(); turnOff(); 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::running || + action->get_state() == kernel::resource::Action::State::ready || + action->get_state() == kernel::resource::Action::State::not_in_the_system) { + action->set_finish_time(date); + action->set_state(kernel::resource::Action::State::failed); } } } @@ -162,10 +152,11 @@ 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()); } + CpuAction* CpuCas01::execution_start(double size, int requestedCores) { return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores); @@ -179,17 +170,17 @@ CpuAction *CpuCas01::sleep(double duration) 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; + // 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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->stateSet_ = static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; - action->getStateSet()->push_back(*action); + simgrid::xbt::intrusive_erase(*action->get_state_set(), *action); + action->state_set_ = &static_cast(model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_; + action->get_state_set()->push_back(*action); } - model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); + model()->getMaxminSystem()->update_variable_weight(action->get_variable(), 0.0); if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap action->heapRemove(model()->getActionHeap()); // this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its @@ -204,20 +195,21 @@ 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 requestedCore) : CpuAction(model, cost, failed, model->getMaxminSystem()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1)) , requestedCore_(requestedCore) { if (model->getUpdateMechanism() == UM_LAZY) { - refreshLastUpdate(); - setLastValue(0.0); + set_last_update(); + set_last_value(0.0); } - model->getMaxminSystem()->expand(constraint, getVariable(), 1.0); + model->getMaxminSystem()->expand(constraint, get_variable(), 1.0); } -CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint) +CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, + kernel::lmm::Constraint* constraint) : CpuCas01Action(model, cost, failed, speed, constraint, 1) { }