X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25f00868d318a0c49b4965ea9dea9a78bc349365..6cb7d1fc585d47d6dbad8c288e8f275448f8025c:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 3f1ab84f94..6d8ca3cc7c 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,31 +6,31 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "maxmin_private.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"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); /********* * 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(_sg_cfg_set, "cpu/optim"); - if (!strcmp(optim, "TI")) { + if (xbt_cfg_get_string("cpu/optim") == "TI") { surf_cpu_model_init_ti(); return; } surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); - xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); + all_existing_models->push_back(surf_cpu_model_pm); surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); - xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); + all_existing_models->push_back(surf_cpu_model_vm); } namespace simgrid { @@ -38,208 +38,158 @@ namespace surf { CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() { - char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); - int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update"); - - if (!strcmp(optim, "Full")) { - p_updateMechanism = UM_FULL; - m_selectiveUpdate = select; - } else if (!strcmp(optim, "Lazy")) { - p_updateMechanism = UM_LAZY; - m_selectiveUpdate = 1; - xbt_assert((select == 1) - || - (xbt_cfg_is_default_value - (_sg_cfg_set, "cpu/maxmin_selective_update")), + 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); + xbt_die("Unsupported optimization (%s) for this model", optim.c_str()); } - p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - - p_maxminSystem = lmm_system_new(m_selectiveUpdate); + maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { - p_actionHeap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(p_actionHeap, surf_action_lmm_update_index_heap); - p_modifiedSet = new ActionLmmList(); - p_maxminSystem->keep_track = p_modifiedSet; + modifiedSet_ = new ActionLmmList(); + maxminSystem_->keep_track = modifiedSet_; } } CpuCas01Model::~CpuCas01Model() { - lmm_system_free(p_maxminSystem); - p_maxminSystem = NULL; - - if (p_actionHeap) - xbt_heap_free(p_actionHeap); - delete p_modifiedSet; - - surf_cpu_model_pm = NULL; - - delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; -} - -Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - int pstate, double speedScale, - tmgr_trace_t speedTrace, int core, - int initiallyOn, - tmgr_trace_t state_trace) -{ - xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0, - "Speed has to be >0.0. Did you forget to specify the mandatory power attribute?"); - xbt_assert(core > 0, "Invalid number of cores %d. Must be larger than 0", core); - Cpu *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace); - return cpu; + surf_cpu_model_pm = nullptr; } -double CpuCas01Model::next_occuring_event_full(double /*now*/) +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) { - return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); + return new CpuCas01(this, host, speedPerPstate, core); } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - int initiallyOn, tmgr_trace_t stateTrace) -: Cpu(model, host, - lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)), - speedPeak, pstate, - core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale, - initiallyOn) { - - XBT_DEBUG("CPU create: peak=%f, pstate=%d", p_speed.peak, m_pstate); - - m_core = core; - if (speedTrace) - p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this); - - if (stateTrace) - p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); +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, + core) +{ } CpuCas01::~CpuCas01() { - if (getModel() == surf_cpu_model_pm) - xbt_dynar_free(&p_speedPeakList); + if (model() == surf_cpu_model_pm) + speedPerPstate_.clear(); } -xbt_dynar_t CpuCas01::getSpeedPeakList(){ - return p_speedPeakList; +std::vector * CpuCas01::getSpeedPeakList(){ + return &speedPerPstate_; } bool CpuCas01::isUsed() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return model()->getMaxminSystem()->constraint_used(constraint()); } /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), - m_core * p_speed.scale * p_speed.peak); - while ((var = lmm_get_var_from_cnst - (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - CpuCas01Action *action = static_cast(lmm_variable_id(var)); - - lmm_update_variable_bound(getModel()->getMaxminSystem(), - action->getVariable(), - p_speed.scale * p_speed.peak); - } + lmm_variable_t 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(), + action->requestedCore() * 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 == p_speed.event) { + if (event == speed_.event) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]"); + xbt_assert(coresAmount_ == 1, "FIXME: add speed scaling code also for constraint_core[i]"); - p_speed.scale = value; + speed_.scale = value; onSpeedChange(); - tmgr_trace_event_unref(&p_speed.event); - } else if (event == p_stateEvent) { + tmgr_trace_event_unref(&speed_.event); + } else if (event == stateEvent_) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ - xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]"); + xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { if(isOff()) - xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); + host_that_restart.push_back(getHost()); turnOn(); } else { - lmm_constraint_t cnst = getConstraint(); - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - double date = surf_get_clock(); + lmm_constraint_t cnst = constraint(); + lmm_variable_t var = nullptr; + const_lmm_element_t elem = nullptr; + double date = surf_get_clock(); turnOff(); - 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))) { + Action* action = static_cast(var->get_id()); - if (action->getState() == SURF_ACTION_RUNNING || - action->getState() == SURF_ACTION_READY || - action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { + if (action->getState() == Action::State::running || + action->getState() == Action::State::ready || + action->getState() == Action::State::not_in_the_system) { action->setFinishTime(date); - action->setState(SURF_ACTION_FAILED); + action->setState(Action::State::failed); } } } - tmgr_trace_event_unref(&p_stateEvent); + tmgr_trace_event_unref(&stateEvent_); } 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(model(), size, isOff(), speed_.scale * speed_.peak, constraint()); +} - XBT_IN("(%s,%g)", getName(), size); - CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), - p_speed.scale * p_speed.peak, getConstraint()); - - XBT_OUT(); - return action; +CpuAction* CpuCas01::execution_start(double size, int requestedCores) +{ + return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores); } 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(), - p_speed.scale * p_speed.peak, getConstraint()); - - - // FIXME: sleep variables should not consume 1.0 in lmm_expand - action->m_maxDuration = duration; - action->m_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->p_stateSet = static_cast(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; + 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 System::expand() + action->setMaxDuration(duration); + action->suspended_ = 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->getStateSet(), *action); + action->stateSet_ = &static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; action->getStateSet()->push_back(*action); } - lmm_update_variable_weight(getModel()->getMaxminSystem(), - action->getVariable(), 0.0); - if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap - action->heapRemove(getModel()->getActionHeap()); - // 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); + model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 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 + // max_duration correctly at the next call to share_resources + model()->getModifiedSet()->push_front(*action); } XBT_OUT(); @@ -249,19 +199,30 @@ CpuAction *CpuCas01::sleep(double duration) /********** * Action * **********/ - -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(Model* model, double cost, bool failed, double speed, lmm_constraint_t 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) { - m_indexHeap = -1; - m_lastUpdate = surf_get_clock(); - m_lastValue = 0.0; + refreshLastUpdate(); + setLastValue(0.0); } - lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); + model->getMaxminSystem()->expand(constraint, getVariable(), 1.0); } +CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint) + : CpuCas01Action(model, cost, failed, speed, constraint, 1) +{ +} + +int CpuCas01Action::requestedCore() +{ + return requestedCore_; +} + +CpuCas01Action::~CpuCas01Action()=default; + } }