X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b646a2e66bc3ff9183235ab20870815dd89f7ea7..1fc042e8bc9c51f9267fa1936deaebe59ae01ee7:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 26af78efce..b3d5beab5b 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,12 +7,11 @@ #include #include +#include #include "ptask_L07.hpp" #include "cpu_interface.hpp" -#include "surf_routing.hpp" -#include "xbt/lib.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -23,8 +22,8 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); void surf_host_model_init_ptask_L07() { XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks."); - xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(!surf_network_model, "network model type already defined"); + xbt_assert(not surf_cpu_model_pm, "CPU model type already defined"); + xbt_assert(not surf_network_model, "network model type already defined"); surf_host_model = new simgrid::surf::HostL07Model(); all_existing_models->push_back(surf_host_model); @@ -39,41 +38,47 @@ HostL07Model::HostL07Model() : HostModel() { maxminSystem_->solve_fun = &bottleneck_solve; surf_network_model = new NetworkL07Model(this,maxminSystem_); surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); - - routing_model_create(surf_network_model->createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr)); } -HostL07Model::~HostL07Model() { +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) - { - maxminSystem_ = sys; - } -CpuL07Model::~CpuL07Model() { - surf_cpu_model_pm = nullptr; - lmm_system_free(maxminSystem_); +{ + maxminSystem_ = sys; +} + +CpuL07Model::~CpuL07Model() +{ maxminSystem_ = nullptr; } + NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) : NetworkModel() , hostModel_(hmodel) - { - maxminSystem_ = sys; - } -NetworkL07Model::~NetworkL07Model() { - maxminSystem_ = nullptr; // Avoid multi-free + maxminSystem_ = sys; + loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); } +NetworkL07Model::~NetworkL07Model() +{ + maxminSystem_ = nullptr; +} double HostL07Model::nextOccuringEvent(double now) { double min = HostModel::nextOccuringEventFull(now); - for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) { + 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_; @@ -89,11 +94,12 @@ 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(ActionList::iterator it = actionSet->begin(), itNext = it - ; it != actionSet->end() - ; it = itNext) { - ++itNext; + for (; it != itend; it = itNext) { + ++itNext; action = static_cast(&*it); if (action->latency_ > 0) { if (action->latency_ > delta) { @@ -101,7 +107,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { } else { action->latency_ = 0.0; } - if ((action->latency_ == 0.0) && (action->isSuspended() == 0)) { + if ((action->latency_ <= 0.0) && (action->isSuspended() == 0)) { action->updateBound(); lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0); } @@ -110,7 +116,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta); action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) + if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains()); @@ -121,31 +127,25 @@ 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->finish(); - action->setState(Action::State::done); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(Action::State::done); + if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 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 */ - lmm_constraint_t cnst = nullptr; int i = 0; - - while ((cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i++))) { + lmm_constraint_t cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), 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); + action->finish(Action::State::failed); break; } + cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); } } } - return; } Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, @@ -153,53 +153,49 @@ Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, 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) { int nb_link = 0; int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ double latency = 0.0; - this->netcardList_->reserve(host_nb); - for (int i = 0; inetcardList_->push_back(host_list[i]->pimpl_netcard); + this->hostList_->reserve(host_nb); + for (int i = 0; i < host_nb; i++) { + this->hostList_->push_back(host_list[i]); + if (flops_amount[i] > 0) + nb_used_host++; + } /* Compute the number of affected resources... */ if(bytes_amount != nullptr) { - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(nullptr); + std::unordered_set affected_links; for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { if (bytes_amount[i * host_nb + j] > 0) { double lat=0.0; - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, &lat); + std::vector route; + hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); latency = MAX(latency, lat); - for (auto link : *route) - xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, nullptr); - delete route; + for (auto const& link : route) + affected_links.insert(link->cname()); } } } - nb_link = xbt_dict_length(ptask_parallel_task_link_set); - xbt_dict_free(&ptask_parallel_task_link_set); + nb_link = affected_links.size(); } - for (int i = 0; i < host_nb; i++) - if (flops_amount[i] > 0) - nb_used_host++; - XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); - this->computationAmount_ = flops_amount; - this->communicationAmount_ = bytes_amount; this->latency_ = latency; - this->rate_ = rate; this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0, (rate > 0 ? rate : -1.0), @@ -209,23 +205,19 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0); for (int i = 0; i < host_nb; i++) - lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->getConstraint(), - this->getVariable(), flops_amount[i]); + lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->constraint(), this->getVariable(), 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); - if (bytes_amount[i * host_nb + j] == 0.0) - continue; - std::vector *route = new std::vector(); - - routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, nullptr); - - for (auto link : *route) - lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]); - - delete route; + for (auto const& link : route) + lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(), + bytes_amount[i * host_nb + j]); + } } } } @@ -255,35 +247,35 @@ Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *spee return new CpuL07(this, host, speedPerPstate, core); } -Link* NetworkL07Model::createLink(const char *name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, xbt_dict_t properties) +LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { - return new LinkL07(this, name, properties, bandwidth, latency, policy); + return new LinkL07(this, name, bandwidth, latency, policy); } /************ * Resource * ************/ -CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) - : Cpu(model, host, speedPerPstate, core) +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) { - constraint_ = lmm_constraint_new(model->getMaxminSystem(), this, speedPerPstate->front()); } CpuL07::~CpuL07()=default; -LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) - : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth)) +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)) { bandwidth_.peak = bandwidth; latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + lmm_constraint_shared(constraint()); - Link::onCreation(this); + s4u::Link::onCreation(this->piface_); } Action *CpuL07::execution_start(double size) @@ -294,7 +286,7 @@ Action *CpuL07::execution_start(double size) host_list[0] = getHost(); flops_amount[0] = size; - return static_cast(getModel())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); + return static_cast(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); } Action *CpuL07::sleep(double duration) @@ -302,13 +294,13 @@ Action *CpuL07::sleep(double duration) L07Action *action = static_cast(execution_start(1.0)); action->maxDuration_ = duration; action->suspended_ = 2; - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); + lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0); return action; } bool CpuL07::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) */ @@ -316,23 +308,24 @@ void CpuL07::onSpeedChange() { lmm_variable_t var = nullptr; lmm_element_t elem = nullptr; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), speed_.peak * speed_.scale); - while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - Action *action = static_cast(lmm_variable_id(var)); + 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)); - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); - } + lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); + } Cpu::onSpeedChange(); } bool LinkL07::isUsed(){ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return lmm_constraint_used(model()->getMaxminSystem(), constraint()); } -void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ - XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); +void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) +{ + XBT_DEBUG("Updating cpu %s (%p) with value %g", cname(), this, value); if (triggered == speed_.event) { speed_.scale = value; onSpeedChange(); @@ -350,8 +343,9 @@ void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ } } -void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) { - XBT_DEBUG("Updating link %s (%p) with value=%f", getName(), this, value); +void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) +{ + XBT_DEBUG("Updating link %s (%p) with value=%f", cname(), this, value); if (triggered == bandwidth_.event) { setBandwidth(value); tmgr_trace_event_unref(&bandwidth_.event); @@ -375,7 +369,7 @@ void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) { void LinkL07::setBandwidth(double value) { bandwidth_.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), bandwidth_.peak * bandwidth_.scale); + lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), bandwidth_.peak * bandwidth_.scale); } void LinkL07::setLatency(double value) @@ -385,18 +379,19 @@ void LinkL07::setLatency(double value) lmm_element_t elem = nullptr; latency_.peak = value; - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { + while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { action = static_cast(lmm_variable_id(var)); action->updateBound(); } } +LinkL07::~LinkL07() = default; /********** * Action * **********/ L07Action::~L07Action(){ - delete netcardList_; + delete hostList_; free(communicationAmount_); free(computationAmount_); } @@ -404,29 +399,26 @@ L07Action::~L07Action(){ void L07Action::updateBound() { double lat_current = 0.0; - double lat_bound = -1.0; - int i, j; - int hostNb = netcardList_->size(); + int hostNb = hostList_->size(); if (communicationAmount_ != nullptr) { - for (i = 0; i < hostNb; i++) { - for (j = 0; j < hostNb; j++) { + for (int i = 0; i < hostNb; i++) { + for (int j = 0; j < hostNb; j++) { if (communicationAmount_[i * hostNb + j] > 0) { double lat = 0.0; - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, &lat); + std::vector route; + hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]); - delete route; } } } } - lat_bound = sg_tcp_gamma / (2.0 * lat_current); + 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_ == 0)) { if (rate_ < 0) lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound); else @@ -437,7 +429,7 @@ void L07Action::updateBound() int L07Action::unref() { refcount_--; - if (!refcount_) { + if (not refcount_) { if (action_hook.is_linked()) stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable())