X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b388a4b552ef42185023f48bb4bc865c99247724..82fd162ad0b5fc51a715b6e6e6df55bb52a18b44:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 00718591d7..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 @@ -12,7 +12,6 @@ #include "ptask_L07.hpp" #include "cpu_interface.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); @@ -41,35 +40,45 @@ HostL07Model::HostL07Model() : HostModel() { surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); } -HostL07Model::~HostL07Model() = default; +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() { - lmm_system_free(maxminSystem_); +{ + maxminSystem_ = sys; +} + +CpuL07Model::~CpuL07Model() +{ maxminSystem_ = nullptr; } + NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) : NetworkModel() , hostModel_(hmodel) - { - maxminSystem_ = sys; - loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); - } -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_; @@ -85,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) { @@ -97,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); } @@ -106,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()); @@ -117,27 +127,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)) { - 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); } } } @@ -160,8 +165,11 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, double latency = 0.0; this->hostList_->reserve(host_nb); - for (int i = 0; ihostList_->push_back(host_list[i]); + if (flops_amount[i] > 0) + nb_used_host++; + } /* Compute the number of affected resources... */ if(bytes_amount != nullptr) { @@ -177,7 +185,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); latency = MAX(latency, lat); - for (auto link : route) + for (auto const& link : route) affected_links.insert(link->cname()); } } @@ -186,10 +194,6 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, 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->latency_ = latency; @@ -206,16 +210,14 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, 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; - 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) + lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(), + bytes_amount[i * host_nb + j]); + } } } } @@ -245,7 +247,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); @@ -263,7 +265,7 @@ CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector 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)) { @@ -311,7 +313,7 @@ void CpuL07::onSpeedChange() { Action* action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); - } + } Cpu::onSpeedChange(); } @@ -321,7 +323,8 @@ bool LinkL07::isUsed(){ return lmm_constraint_used(model()->getMaxminSystem(), constraint()); } -void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double 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; @@ -340,7 +343,8 @@ void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ } } -void LinkL07::apply_event(tmgr_trace_iterator_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); if (triggered == bandwidth_.event) { setBandwidth(value); @@ -380,6 +384,7 @@ void LinkL07::setLatency(double value) action->updateBound(); } } +LinkL07::~LinkL07() = default; /********** * Action * @@ -413,7 +418,7 @@ 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_ == 0)) { if (rate_ < 0) lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound); else @@ -424,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())