X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..6cb7d1fc585d47d6dbad8c288e8f275448f8025c:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 99707a2730..6d8ca3cc7c 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 "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"); @@ -52,8 +53,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() xbt_die("Unsupported optimization (%s) for this model", optim.c_str()); } - p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - maxminSystem_ = lmm_system_new(selectiveUpdate_); + maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { modifiedSet_ = new ActionLmmList(); @@ -63,13 +63,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() CpuCas01Model::~CpuCas01Model() { - lmm_system_free(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) @@ -80,9 +74,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) { } @@ -98,20 +92,20 @@ 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) */ void CpuCas01::onSpeedChange() { - lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; + lmm_variable_t var = nullptr; + const_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(); @@ -136,15 +130,15 @@ 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; - lmm_element_t elem = nullptr; - 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(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 || @@ -162,10 +156,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 +174,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 + // FIXME: sleep variables should not consume 1.0 in System::expand() action->setMaxDuration(duration); - action->suspended_ = 2; + 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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->stateSet_ = static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; + simgrid::xbt::intrusive_erase(*action->getStateSet(), *action); + action->stateSet_ = &static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; 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 @@ -207,14 +202,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) { 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)