X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccc1670e4bf36086f1f524b5ef004d5210415488..b98b530ed10d60d9c350bf4919896a0c50b649f3:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 9f1a3a2c42..22eac86469 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, 2013-2015. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,33 +9,27 @@ #include "maxmin_private.hpp" #include "simgrid/sg_config.h" -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() { - char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); + xbt_assert(not surf_cpu_model_pm); + xbt_assert(not surf_cpu_model_vm); - xbt_assert(!surf_cpu_model_pm); - xbt_assert(!surf_cpu_model_vm); - - if (!strcmp(optim, "TI")) { + char *optim = xbt_cfg_get_string("cpu/optim"); + if (not strcmp(optim, "TI")) { surf_cpu_model_init_ti(); return; } surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(); - surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); - - sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces); + all_existing_models->push_back(surf_cpu_model_pm); - simgrid::surf::Model *model_pm = surf_cpu_model_pm; - simgrid::surf::Model *model_vm = surf_cpu_model_vm; - xbt_dynar_push(all_existing_models, &model_pm); - xbt_dynar_push(all_existing_models, &model_vm); + surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(); + all_existing_models->push_back(surf_cpu_model_vm); } namespace simgrid { @@ -43,244 +37,141 @@ 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")), + char *optim = xbt_cfg_get_string("cpu/optim"); + bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + + if (not strcmp(optim, "Full")) { + updateMechanism_ = UM_FULL; + selectiveUpdate_ = select; + } else if (not 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); } p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); + maxminSystem_ = lmm_system_new(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { - shareResources = &CpuCas01Model::shareResourcesLazy; - updateActionsState = &CpuCas01Model::updateActionsStateLazy; - - } else if (getUpdateMechanism() == UM_FULL) { - shareResources = &CpuCas01Model::shareResourcesFull; - updateActionsState = &CpuCas01Model::updateActionsStateFull; - } else - xbt_die("Invalid cpu update mechanism!"); - - if (!p_maxminSystem) { - p_maxminSystem = lmm_system_new(m_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; + 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_; } } CpuCas01Model::~CpuCas01Model() { - lmm_system_free(p_maxminSystem); - p_maxminSystem = NULL; + lmm_system_free(maxminSystem_); + maxminSystem_ = nullptr; + xbt_heap_free(actionHeap_); + delete modifiedSet_; - if (p_actionHeap) - xbt_heap_free(p_actionHeap); - delete p_modifiedSet; - - surf_cpu_model_pm = NULL; + surf_cpu_model_pm = nullptr; delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -Cpu *CpuCas01Model::createCpu(const char *name, xbt_dynar_t speedPeak, - int pstate, double speedScale, - tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace) +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) { - 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, name, speedPeak, pstate, speedScale, speedTrace, core, state_initial, state_trace); - return cpu; -} - -double CpuCas01Model::shareResourcesFull(double /*now*/) -{ - return Model::shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); -} - -void CpuCas01Model::addTraces() -{ - xbt_dict_cursor_t cursor = NULL; - char *trace_name, *elm; - static int called = 0; - if (called) - return; - called = 1; - - /* connect all traces relative to hosts */ - xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuCas01 *host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); - - xbt_assert(host, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); - } - - xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuCas01 *host = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); - - xbt_assert(host, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)); - } + return new CpuCas01(this, host, speedPerPstate, core); } /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t speedPeak, - int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) -: Cpu(model, name, - lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)), - core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale, - stateInitial) { - p_speedEvent = NULL; - - // Copy the power peak array: - p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr); - unsigned long n = xbt_dynar_length(speedPeak); - for (unsigned long i = 0; i != n; ++i) { - double value = xbt_dynar_get_as(speedPeak, i, double); - xbt_dynar_push(p_speedPeakList, &value); - } - - m_pstate = pstate; - - XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate); - - m_core = core; - if (speedTrace) - p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); - - if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); +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() { - this->die(); - if (getModel() == surf_cpu_model_pm) - xbt_dynar_free(&p_speedPeakList); + if (model() == surf_cpu_model_pm) + speedPerPstate_.clear(); } -void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent) -{ - p_stateEvent = stateEvent; +std::vector * CpuCas01::getSpeedPeakList(){ + return &speedPerPstate_; } -void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent) +bool CpuCas01::isUsed() { - p_speedEvent = powerEvent; + return lmm_constraint_used(model()->getMaxminSystem(), constraint()); } -xbt_dynar_t CpuCas01::getSpeedPeakList(){ - return p_speedPeakList; -} +/** @brief take into account changes of speed (either load or max) */ +void CpuCas01::onSpeedChange() { + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; -int CpuCas01::getPState() -{ - return m_pstate; -} + lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), coresAmount_ * speed_.scale * speed_.peak); + while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { + CpuCas01Action* action = static_cast(lmm_variable_id(var)); -bool CpuCas01::isUsed() -{ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), + action->requestedCore() * speed_.scale * speed_.peak); + } + + Cpu::onSpeedChange(); } -void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double date) +void CpuCas01::apply_event(tmgr_trace_event_t event, double value) { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - if (event_type == p_speedEvent) { - /* 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]"); - - m_speedScale = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), - m_core * m_speedScale * - m_speedPeak); - TRACE_surf_host_set_speed(date, getName(), - m_core * m_speedScale * - m_speedPeak); - 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(), - m_speedScale * m_speedPeak); - } - if (tmgr_trace_event_free(event_type)) - p_speedEvent = NULL; - } else if (event_type == p_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]"); + 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]"); + + speed_.scale = value; + onSpeedChange(); + + tmgr_trace_event_unref(&speed_.event); + } else if (event == stateEvent_) { + /* TODO (Hypervisor): do the same thing for constraint_core[i] */ + xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]"); if (value > 0) { - if(getState() == SURF_RESOURCE_OFF) - xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); - setState(SURF_RESOURCE_ON); + if(isOff()) + host_that_restart.push_back(getHost()); + turnOn(); } else { - lmm_constraint_t cnst = getConstraint(); + lmm_constraint_t cnst = constraint(); + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; + double date = surf_get_clock(); - setState(SURF_RESOURCE_OFF); + turnOff(); - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { + while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), cnst, &elem))) { Action *action = static_cast(lmm_variable_id(var)); - 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); } } } - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&stateEvent_); + } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event!\n"); } - - return; } -CpuAction *CpuCas01::execute(double size) +/** @brief Start a new execution on this CPU lasting @param size flops and using one core */ +CpuAction *CpuCas01::execution_start(double size) { - - XBT_IN("(%s,%g)", getName(), size); - CpuCas01Action *action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON, - m_speedScale * m_speedPeak, getConstraint()); - - XBT_OUT(); - return action; + 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); } CpuAction *CpuCas01::sleep(double duration) @@ -288,86 +179,59 @@ 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, getState() != SURF_RESOURCE_ON, - m_speedScale * m_speedPeak, getConstraint()); - + XBT_IN("(%s,%g)", cname(), 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->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; + action->maxDuration_ = duration; + action->suspended_ = 2; + 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); } - 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); + lmm_update_variable_weight(model()->getMaxminSystem(), 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(); return action; } -double CpuCas01::getCurrentPowerPeak() -{ - return m_speedPeak; -} - -double CpuCas01::getPowerPeakAt(int pstate_index) -{ - xbt_dynar_t plist = p_speedPeakList; - xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); - - return xbt_dynar_get_as(plist, pstate_index, double); -} - -int CpuCas01::getNbPstates() +/********** + * Action * + **********/ +CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint, + int requestedCore) + : CpuAction(model, cost, failed, + lmm_variable_new(model->getMaxminSystem(), this, 1.0 / requestedCore, requestedCore * speed, 1)) + , requestedCore_(requestedCore) { - return xbt_dynar_length(p_speedPeakList); + if (model->getUpdateMechanism() == UM_LAZY) { + indexHeap_ = -1; + lastUpdate_ = surf_get_clock(); + lastValue_ = 0.0; + } + lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); } -void CpuCas01::setPstate(int pstate_index) +CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint) + : CpuCas01Action(model, cost, failed, speed, constraint, 1) { - xbt_dynar_t plist = p_speedPeakList; - xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); - - double new_pstate = xbt_dynar_get_as(plist, pstate_index, double); - m_pstate = pstate_index; - m_speedPeak = new_pstate; } -int CpuCas01::getPstate() +int CpuCas01Action::requestedCore() { - return m_pstate; + return requestedCore_; } -/********** - * 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)) -{ - m_suspended = 0; - if (model->getUpdateMechanism() == UM_LAZY) { - m_indexHeap = -1; - m_lastUpdate = surf_get_clock(); - m_lastValue = 0.0; - } - lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0); -} +CpuCas01Action::~CpuCas01Action()=default; } }