X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..c9309ca5ce7b71208ec162d803972feabe4e42da:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index ca7cae6f4e..d25bf1f88a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -6,8 +6,9 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "maxmin_private.hpp" #include "simgrid/sg_config.h" +#include "surf/maxmin.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); @@ -19,8 +20,7 @@ void surf_cpu_model_init_Cas01() xbt_assert(not surf_cpu_model_pm); xbt_assert(not surf_cpu_model_vm); - char *optim = xbt_cfg_get_string("cpu/optim"); - if (not strcmp(optim, "TI")) { + if (xbt_cfg_get_string("cpu/optim") == "TI") { surf_cpu_model_init_ti(); return; } @@ -37,27 +37,25 @@ namespace surf { CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() { - char *optim = xbt_cfg_get_string("cpu/optim"); + std::string 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; + if (optim == "Full") { + setUpdateMechanism(UM_FULL); selectiveUpdate_ = select; - } else if (not strcmp(optim, "Lazy")) { - updateMechanism_ = UM_LAZY; + } 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_); + maxminSystem_ = new s_lmm_system_t(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { - 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_; } @@ -65,9 +63,8 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() CpuCas01Model::~CpuCas01Model() { - lmm_system_free(maxminSystem_); + delete maxminSystem_; maxminSystem_ = nullptr; - xbt_heap_free(actionHeap_); delete modifiedSet_; surf_cpu_model_pm = nullptr; @@ -83,9 +80,9 @@ Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector *spe /************ * Resource * ************/ -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(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) + : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate, + core) { } @@ -101,7 +98,7 @@ std::vector * CpuCas01::getSpeedPeakList(){ bool CpuCas01::isUsed() { - return lmm_constraint_used(model()->getMaxminSystem(), constraint()); + return model()->getMaxminSystem()->constraint_used(constraint()); } /** @brief take into account changes of speed (either load or max) */ @@ -109,12 +106,12 @@ void CpuCas01::onSpeedChange() { 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)); + model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak); + while ((var = constraint()->get_variable(&elem))) { + CpuCas01Action* action = static_cast(var->get_id()); - lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), - action->requestedCore() * speed_.scale * speed_.peak); + model()->getMaxminSystem()->update_variable_bound(action->getVariable(), + action->requestedCore() * speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -146,8 +143,8 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) turnOff(); - while ((var = lmm_get_var_from_cnst(model()->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() == Action::State::running || action->getState() == Action::State::ready || @@ -177,13 +174,13 @@ CpuAction* CpuCas01::execution_start(double size, int requestedCores) CpuAction *CpuCas01::sleep(double duration) { if (duration > 0) - duration = MAX(duration, sg_surf_precision); + 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 lmm_expand - action->maxDuration_ = duration; + action->setMaxDuration(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 */ @@ -192,7 +189,7 @@ CpuAction *CpuCas01::sleep(double duration) action->getStateSet()->push_back(*action); } - lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0); + 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 @@ -210,15 +207,14 @@ CpuAction *CpuCas01::sleep(double duration) 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)) + model->getMaxminSystem()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1)) , requestedCore_(requestedCore) { if (model->getUpdateMechanism() == UM_LAZY) { - indexHeap_ = -1; - lastUpdate_ = surf_get_clock(); - 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)