X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2870500ed94896ec3b064fa67af8d729920c007..403af5e6247ce6452b721f418a5b41e4548efac4:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 24189a472e..40d145e9cd 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 @@ -16,20 +16,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the *********/ 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("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 { @@ -37,28 +36,26 @@ namespace surf { CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() { - char *optim = xbt_cfg_get_string("cpu/optim"); - int select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + std::string optim = xbt_cfg_get_string("cpu/optim"); + bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); - if (!strcmp(optim, "Full")) { - updateMechanism_ = UM_FULL; + if (optim == "Full") { + setUpdateMechanism(UM_FULL); selectiveUpdate_ = select; - } else if (!strcmp(optim, "Lazy")) { - updateMechanism_ = UM_LAZY; - selectiveUpdate_ = 1; - xbt_assert((select == 1) - || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")), + } 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(); - maxminSystem_ = lmm_system_new(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { - actionHeap_ = xbt_heap_new(8, NULL); + 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_; @@ -68,70 +65,61 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() CpuCas01Model::~CpuCas01Model() { lmm_system_free(maxminSystem_); - maxminSystem_ = NULL; + maxminSystem_ = nullptr; xbt_heap_free(actionHeap_); delete modifiedSet_; - surf_cpu_model_pm = NULL; + surf_cpu_model_pm = nullptr; delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } -Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) +Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) { return new CpuCas01(this, host, speedPerPstate, core); } -double CpuCas01Model::next_occuring_event_full(double /*now*/) -{ - return Model::shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve); -} - /************ * Resource * ************/ -CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) -: Cpu(model, host, - lmm_constraint_new(model->getMaxminSystem(), this, core * xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double)), +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() { - if (getModel() == surf_cpu_model_pm) - xbt_dynar_free(&speedPerPstate_); + if (model() == surf_cpu_model_pm) + speedPerPstate_.clear(); } -xbt_dynar_t CpuCas01::getSpeedPeakList(){ - return speedPerPstate_; +std::vector * CpuCas01::getSpeedPeakList(){ + return &speedPerPstate_; } bool CpuCas01::isUsed() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return lmm_constraint_used(model()->getMaxminSystem(), 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(), - coresAmount_ * speed_.scale * 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(), - speed_.scale * speed_.peak); - } + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; + + 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)); + + lmm_update_variable_bound(model()->getMaxminSystem(), 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 == speed_.event) { /* TODO (Hypervisor): do the same thing for constraint_core[i] */ @@ -147,17 +135,17 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) 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; + lmm_constraint_t cnst = constraint(); + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; double date = surf_get_clock(); 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() == Action::State::running || @@ -175,15 +163,14 @@ void CpuCas01::apply_event(tmgr_trace_iterator_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) { - - XBT_IN("(%s,%g)", getName(), size); - CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(), - speed_.scale * speed_.peak, 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) @@ -191,29 +178,25 @@ 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(), - speed_.scale * speed_.peak, getConstraint()); + 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->maxDuration_ = duration; + action->setMaxDuration(duration); action->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 */ + 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(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; + 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(); @@ -223,19 +206,31 @@ 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, + lmm_variable_new(model->getMaxminSystem(), this, 1.0 / requestedCore, requestedCore * speed, 1)) + , requestedCore_(requestedCore) { if (model->getUpdateMechanism() == UM_LAZY) { - indexHeap_ = -1; - lastUpdate_ = surf_get_clock(); - lastValue_ = 0.0; + updateIndexHeap(-1); + refreshLastUpdate(); + setLastValue(0.0); } lmm_expand(model->getMaxminSystem(), 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; + } }