X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..dac676c1180a5ea95897072e55f698433a857d90:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 7a3c22b6db..d4eb8a24bd 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -12,6 +12,7 @@ #include "ptask_L07.hpp" #include "cpu_interface.hpp" +#include "xbt/utility.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -34,23 +35,19 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = lmm_system_new(true /* lazy */); - maxminSystem_->solve_fun = &bottleneck_solve; + maxminSystem_ = new simgrid::kernel::lmm::System(true /* lazy */); + maxminSystem_->solve_fun = &simgrid::kernel::lmm::bottleneck_solve; surf_network_model = new NetworkL07Model(this,maxminSystem_); surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); } HostL07Model::~HostL07Model() { - lmm_system_free(maxminSystem_); - maxminSystem_ = nullptr; delete surf_network_model; delete surf_cpu_model_pm; } -CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) - : CpuModel() - , hostModel_(hmodel) +CpuL07Model::CpuL07Model(HostL07Model* hmodel, lmm_system_t sys) : CpuModel(), hostModel_(hmodel) { maxminSystem_ = sys; } @@ -60,9 +57,7 @@ CpuL07Model::~CpuL07Model() maxminSystem_ = nullptr; } -NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , hostModel_(hmodel) +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys) : NetworkModel(), hostModel_(hmodel) { maxminSystem_ = sys; loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); @@ -101,12 +96,12 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) } if ((action.latency_ <= 0.0) && (action.isSuspended() == 0)) { action.updateBound(); - lmm_update_variable_weight(maxminSystem_, action.getVariable(), 1.0); + maxminSystem_->update_variable_weight(action.getVariable(), 1.0); } } XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.getRemains(), - lmm_variable_getvalue(action.getVariable()) * delta); - action.updateRemains(lmm_variable_getvalue(action.getVariable()) * delta); + action.getVariable()->get_value() * delta); + action.updateRemains(action.getVariable()->get_value() * delta); if (action.getMaxDuration() > NO_MAX_DURATION) action.updateMaxDuration(delta); @@ -119,22 +114,22 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) * If it's not done, it may have failed. */ - if (((action.getRemains() <= 0) && (lmm_get_variable_weight(action.getVariable()) > 0)) || + if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) || ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { action.finish(Action::State::done); } else { /* Need to check that none of the model has failed */ int i = 0; - lmm_constraint_t cnst = lmm_get_cnst_from_var(maxminSystem_, action.getVariable(), i); + kernel::lmm::Constraint* cnst = action.getVariable()->get_constraint(i); while (cnst != nullptr) { i++; - void *constraint_id = lmm_constraint_id(cnst); - if (static_cast(constraint_id)->isOff()) { + void* constraint_id = cnst->get_id(); + if (static_cast(constraint_id)->isOff()) { XBT_DEBUG("Action (%p) Failed!!", &action); action.finish(Action::State::failed); break; } - cnst = lmm_get_cnst_from_var(maxminSystem_, action.getVariable(), i); + cnst = action.getVariable()->get_constraint(i); } } } @@ -189,13 +184,13 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); latency_ = latency; - setVariable(lmm_variable_new(model->getMaxminSystem(), this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); + setVariable(model->getMaxminSystem()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); if (latency_ > 0) - lmm_update_variable_weight(model->getMaxminSystem(), getVariable(), 0.0); + model->getMaxminSystem()->update_variable_weight(getVariable(), 0.0); for (int i = 0; i < host_nb; i++) - lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->constraint(), getVariable(), flops_amount[i]); + model->getMaxminSystem()->expand(host_list[i]->pimpl_cpu->constraint(), getVariable(), flops_amount[i]); if(bytes_amount != nullptr) { for (int i = 0; i < host_nb; i++) { @@ -205,8 +200,8 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, hostList_->at(i)->routeTo(hostList_->at(j), route, nullptr); for (auto const& link : route) - lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(), - bytes_amount[i * host_nb + j]); + model->getMaxminSystem()->expand_add(link->constraint(), this->getVariable(), + bytes_amount[i * host_nb + j]); } } } @@ -248,8 +243,7 @@ LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, ************/ CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, lmm_constraint_new(model->getMaxminSystem(), this, speedPerPstate->front()), speedPerPstate, - core) + : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) { } @@ -257,13 +251,13 @@ CpuL07::~CpuL07()=default; LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) - : LinkImpl(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth)) + : LinkImpl(model, name, model->getMaxminSystem()->constraint_new(this, bandwidth)) { bandwidth_.peak = bandwidth; latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(constraint()); + constraint()->unshare(); s4u::Link::onCreation(this->piface_); } @@ -283,26 +277,26 @@ Action *CpuL07::sleep(double duration) { L07Action *action = static_cast(execution_start(1.0)); action->setMaxDuration(duration); - action->suspended_ = 2; - lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0); + action->suspended_ = Action::SuspendStates::sleeping; + model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); return action; } bool CpuL07::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 CpuL07::onSpeedChange() { - lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; + kernel::lmm::Variable* var = nullptr; + const_lmm_element_t elem = nullptr; - lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), speed_.peak * speed_.scale); - while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { - Action* action = static_cast(lmm_variable_id(var)); + model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale); + while ((var = constraint()->get_variable(&elem))) { + Action* action = static_cast(var->get_id()); - lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); + model()->getMaxminSystem()->update_variable_bound(action->getVariable(), speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -310,7 +304,7 @@ void CpuL07::onSpeedChange() { bool LinkL07::isUsed(){ - return lmm_constraint_used(model()->getMaxminSystem(), constraint()); + return model()->getMaxminSystem()->constraint_used(constraint()); } void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) @@ -359,18 +353,18 @@ void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) void LinkL07::setBandwidth(double value) { bandwidth_.peak = value; - lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), bandwidth_.peak * bandwidth_.scale); + model()->getMaxminSystem()->update_constraint_bound(constraint(), bandwidth_.peak * bandwidth_.scale); } void LinkL07::setLatency(double value) { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; L07Action *action; - lmm_element_t elem = nullptr; + const_lmm_element_t elem = nullptr; latency_.peak = value; - while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { - action = static_cast(lmm_variable_id(var)); + while ((var = constraint()->get_variable(&elem))) { + action = static_cast(var->get_id()); action->updateBound(); } } @@ -408,11 +402,11 @@ void L07Action::updateBound() } double lat_bound = sg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); - if ((latency_ <= 0.0) && (suspended_ == 0)) { + if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) { if (rate_ < 0) - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound); + getModel()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound); else - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), std::min(rate_, lat_bound)); + getModel()->getMaxminSystem()->update_variable_bound(getVariable(), std::min(rate_, lat_bound)); } } @@ -420,10 +414,10 @@ int L07Action::unref() { refcount_--; if (not refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); + if (stateSetHook_.is_linked()) + simgrid::xbt::intrusive_erase(*stateSet_, *this); if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); + getModel()->getMaxminSystem()->variable_free(getVariable()); delete this; return 1; }