X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13fb4af932a02ea0bd4293d1e55ac071de326f80..8de466d0f03f18b22c6c36170b509d48a39fcd52:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 24129d9f56..0454e7a340 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -12,6 +11,8 @@ #include "ptask_L07.hpp" #include "cpu_interface.hpp" +#include "xbt/config.hpp" +#include "xbt/utility.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -34,55 +35,49 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = lmm_system_new(true /* lazy */); - maxminSystem_->solve_fun = &bottleneck_solve; - surf_network_model = new NetworkL07Model(this,maxminSystem_); - surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); + auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */); + set_maxmin_system(maxmin_system); + surf_network_model = new NetworkL07Model(this, maxmin_system); + surf_cpu_model_pm = new CpuL07Model(this, maxmin_system); } 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, kernel::lmm::System* sys) + : CpuModel(Model::UpdateAlgo::Full), hostModel_(hmodel) { - maxminSystem_ = sys; + set_maxmin_system(sys); } CpuL07Model::~CpuL07Model() { - maxminSystem_ = nullptr; + set_maxmin_system(nullptr); } -NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , hostModel_(hmodel) +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) + : NetworkModel(Model::UpdateAlgo::Full), hostModel_(hmodel) { - maxminSystem_ = sys; - loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); + set_maxmin_system(sys); + loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); } NetworkL07Model::~NetworkL07Model() { - maxminSystem_ = nullptr; + set_maxmin_system(nullptr); } -double HostL07Model::nextOccuringEvent(double now) +double HostL07Model::next_occuring_event(double now) { - double min = HostModel::nextOccuringEventFull(now); - ActionList::iterator it(getRunningActionSet()->begin()); - ActionList::iterator itend(getRunningActionSet()->end()); - for (; it != itend; ++it) { - L07Action *action = static_cast(&*it); - if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) { - min = action->latency_; - XBT_DEBUG("Updating min with %p (start %f): %f", action, action->getStartTime(), min); + double min = HostModel::next_occuring_event_full(now); + for (kernel::resource::Action const& action : *get_running_action_set()) { + const L07Action& net_action = static_cast(action); + if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) { + min = net_action.latency_; + XBT_DEBUG("Updating min with %p (start %f): %f", &net_action, net_action.get_start_time(), min); } } XBT_DEBUG("min value: %f", min); @@ -90,36 +85,30 @@ double HostL07Model::nextOccuringEvent(double now) return min; } -void HostL07Model::updateActionsState(double /*now*/, double delta) { - - L07Action *action; - ActionList *actionSet = getRunningActionSet(); - ActionList::iterator it(actionSet->begin()); - ActionList::iterator itNext = it; - ActionList::iterator itend(actionSet->end()); - - for (; it != itend; it = itNext) { - ++itNext; - action = static_cast(&*it); - if (action->latency_ > 0) { - if (action->latency_ > delta) { - double_update(&(action->latency_), delta, sg_surf_precision); +void HostL07Model::update_actions_state(double /*now*/, double delta) +{ + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { + L07Action& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it + if (action.latency_ > 0) { + if (action.latency_ > delta) { + double_update(&(action.latency_), delta, sg_surf_precision); } else { - action->latency_ = 0.0; + action.latency_ = 0.0; } - if ((action->latency_ <= 0.0) && (action->isSuspended() == 0)) { - action->updateBound(); - lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0); + if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) { + action.updateBound(); + get_maxmin_system()->update_variable_weight(action.get_variable(), 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); + XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), + action.get_variable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); - if (action->getMaxDuration() > NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.get_max_duration() > NO_MAX_DURATION) + action.update_max_duration(delta); - XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains()); + XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains()); /* In the next if cascade, the action can be finished either because: * - The amount of remaining work reached 0 @@ -127,40 +116,36 @@ 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)) || - ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { - action->finish(); - action->setState(Action::State::done); + if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(kernel::resource::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.get_variable()->get_constraint(i); while (cnst != nullptr) { i++; - void *constraint_id = lmm_constraint_id(cnst); - if (static_cast(constraint_id)->isOff()) { - XBT_DEBUG("Action (%p) Failed!!", action); - action->finish(); - action->setState(Action::State::failed); + void* constraint_id = cnst->get_id(); + if (static_cast(constraint_id)->is_off()) { + XBT_DEBUG("Action (%p) Failed!!", &action); + action.finish(kernel::resource::Action::State::failed); break; } - cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); + cnst = action.get_variable()->get_constraint(i); } } } } -Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount,double rate) { +kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double rate) +{ return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); } -L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount, double rate) - : CpuAction(model, 1, 0) - , computationAmount_(flops_amount) - , communicationAmount_(bytes_amount) - , rate_(rate) +L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double rate) + : CpuAction(model, 1, 0), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) { int nb_link = 0; int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ @@ -184,11 +169,11 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, double lat=0.0; std::vector route; - hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); - latency = MAX(latency, lat); + hostList_->at(i)->routeTo(hostList_->at(j), route, &lat); + latency = std::max(latency, lat); - for (auto link : route) - affected_links.insert(link->cname()); + for (auto const& link : route) + affected_links.insert(link->get_cname()); } } } @@ -197,51 +182,49 @@ 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); - this->latency_ = latency; + latency_ = latency; - this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0, - (rate > 0 ? rate : -1.0), - host_nb + nb_link); + set_variable(model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); - if (this->latency_ > 0) - lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0); + if (latency_ > 0) + model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); for (int i = 0; i < host_nb; i++) - lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->constraint(), this->getVariable(), flops_amount[i]); + model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), flops_amount[i]); if(bytes_amount != nullptr) { for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { if (bytes_amount[i * host_nb + j] > 0.0) { std::vector route; - hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr); + hostList_->at(i)->routeTo(hostList_->at(j), route, nullptr); - for (auto link : route) - lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(), - bytes_amount[i * host_nb + j]); + for (auto const& link : route) + model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), + bytes_amount[i * host_nb + j]); } } } } if (nb_link + nb_used_host == 0) { - this->setCost(1.0); - this->setRemains(0.0); + this->set_cost(1.0); + this->set_remains(0.0); } - xbt_free(host_list); + delete[] host_list; } -Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - sg_host_t*host_list = xbt_new0(sg_host_t, 2); - double *flops_amount = xbt_new0(double, 2); - double *bytes_amount = xbt_new0(double, 4); + sg_host_t* host_list = new sg_host_t[2](); + double* flops_amount = new double[2](); + double* bytes_amount = new double[4](); host_list[0] = src; host_list[1] = dst; bytes_amount[1] = size; - return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); + return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); } Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) @@ -249,7 +232,7 @@ Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *spee return new CpuL07(this, host, speedPerPstate, core); } -LinkImpl* NetworkL07Model::createLink(const char* name, double bandwidth, double latency, +LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) { return new LinkL07(this, name, bandwidth, latency, policy); @@ -260,74 +243,74 @@ LinkImpl* NetworkL07Model::createLink(const char* name, double bandwidth, double ************/ 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->get_maxmin_system()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) { } CpuL07::~CpuL07()=default; -LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency, +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->get_maxmin_system()->constraint_new(this, bandwidth)) { bandwidth_.peak = bandwidth; latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(constraint()); + get_constraint()->unshare(); s4u::Link::onCreation(this->piface_); } -Action *CpuL07::execution_start(double size) +kernel::resource::Action* CpuL07::execution_start(double size) { - sg_host_t*host_list = xbt_new0(sg_host_t, 1); - double *flops_amount = xbt_new0(double, 1); + sg_host_t* host_list = new sg_host_t[1](); + double* flops_amount = new double[1](); host_list[0] = getHost(); flops_amount[0] = size; - return static_cast(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); + return static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); } -Action *CpuL07::sleep(double duration) +kernel::resource::Action* CpuL07::sleep(double duration) { L07Action *action = static_cast(execution_start(1.0)); - action->maxDuration_ = duration; - action->suspended_ = 2; - lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0); + action->set_max_duration(duration); + action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); return action; } -bool CpuL07::isUsed(){ - return lmm_constraint_used(model()->getMaxminSystem(), constraint()); +bool CpuL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_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 kernel::lmm::Element* 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)); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale); + while ((var = get_constraint()->get_variable(&elem))) { + kernel::resource::Action* action = static_cast(var->get_id()); - lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } Cpu::onSpeedChange(); } - -bool LinkL07::isUsed(){ - return lmm_constraint_used(model()->getMaxminSystem(), constraint()); +bool LinkL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) { - XBT_DEBUG("Updating cpu %s (%p) with value %g", cname(), this, value); + XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); if (triggered == speed_.event) { speed_.scale = value; onSpeedChange(); @@ -335,9 +318,9 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == stateEvent_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); + turn_off(); tmgr_trace_event_unref(&stateEvent_); } else { @@ -347,7 +330,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) { - XBT_DEBUG("Updating link %s (%p) with value=%f", cname(), this, value); + XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value); if (triggered == bandwidth_.event) { setBandwidth(value); tmgr_trace_event_unref(&bandwidth_.event); @@ -358,9 +341,9 @@ void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == stateEvent_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); + turn_off(); tmgr_trace_event_unref(&stateEvent_); } else { @@ -371,18 +354,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); + get_model()->get_maxmin_system()->update_constraint_bound(get_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 kernel::lmm::Element* 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 = get_constraint()->get_variable(&elem))) { + action = static_cast(var->get_id()); action->updateBound(); } } @@ -394,8 +377,8 @@ LinkL07::~LinkL07() = default; L07Action::~L07Action(){ delete hostList_; - free(communicationAmount_); - free(computationAmount_); + delete[] communicationAmount_; + delete[] computationAmount_; } void L07Action::updateBound() @@ -411,35 +394,21 @@ void L07Action::updateBound() if (communicationAmount_[i * hostNb + j] > 0) { double lat = 0.0; std::vector route; - hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); + hostList_->at(i)->routeTo(hostList_->at(j), route, &lat); - lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]); + lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]); } } } } - double lat_bound = sg_tcp_gamma / (2.0 * lat_current); + double lat_bound = NetworkModel::cfg_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); + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound); else - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), std::min(rate_, lat_bound)); - } -} - -int L07Action::unref() -{ - refcount_--; - if (not refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); - if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); - delete this; - return 1; + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), std::min(rate_, lat_bound)); } - return 0; } }