X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16f92c056ae54aa6ddcd59522e469a74b48f30b7..a4e7a60bca6c13451f237201eb5a7534e5da0838:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 1282315a52..9bd196ab18 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2017. 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. */ @@ -8,13 +7,12 @@ #include "maxmin_private.hpp" #include "network_cm02.hpp" -#include "simgrid/s4u/host.hpp" +#include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.h" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -double sg_sender_gap = 0.0; double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ @@ -66,12 +64,12 @@ void surf_network_model_init_CM02() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - all_existing_models->push_back(surf_network_model); - xbt_cfg_setdefault_double("network/latency-factor", 1.0); xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); xbt_cfg_setdefault_double("network/weight-S", 0.0); + + surf_network_model = new simgrid::surf::NetworkCm02Model(); + all_existing_models->push_back(surf_network_model); } /***************************************************************************/ @@ -89,14 +87,14 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); - all_existing_models->push_back(surf_network_model); - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + all_existing_models->push_back(surf_network_model); } @@ -105,14 +103,14 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); - all_existing_models->push_back(surf_network_model); - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + all_existing_models->push_back(surf_network_model); } void surf_network_model_init_Vegas() @@ -120,14 +118,14 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); - all_existing_models->push_back(surf_network_model); - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); - xbt_cfg_setdefault_double("network/latency-factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); - xbt_cfg_setdefault_double("network/weight-S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + all_existing_models->push_back(surf_network_model); } namespace simgrid { @@ -139,10 +137,10 @@ NetworkCm02Model::NetworkCm02Model() char *optim = xbt_cfg_get_string("network/optim"); bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); - if (!strcmp(optim, "Full")) { + if (not strcmp(optim, "Full")) { updateMechanism_ = UM_FULL; selectiveUpdate_ = select; - } else if (!strcmp(optim, "Lazy")) { + } else if (not strcmp(optim, "Lazy")) { updateMechanism_ = UM_LAZY; selectiveUpdate_ = true; xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")), @@ -167,10 +165,7 @@ NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) maxminSystem_->solve_fun = specificSolveFun; } - -NetworkCm02Model::~NetworkCm02Model() {} - -LinkImpl* NetworkCm02Model::createLink(const char* name, double bandwidth, double latency, +LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) { return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxminSystem_); @@ -191,7 +186,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) NetworkCm02Link *link = static_cast(lmm_constraint_id(constraint)); double value = lmm_variable_getvalue(action->getVariable())* lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i); - TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), value, action->getLastUpdate(), + TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), value, action->getLastUpdate(), now - action->getLastUpdate()); } } @@ -209,11 +204,8 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); action->setRemains(0); - action->finish(); - action->setState(Action::State::done); + action->finish(Action::State::done); action->heapRemove(actionHeap_); - - action->gapRemove(); } } } @@ -238,7 +230,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) double_update(&(deltap), action->latency_, sg_surf_precision); action->latency_ = 0.0; } - if (action->latency_ == 0.0 && !(action->isSuspended())) + if (action->latency_ <= 0.0 && not action->isSuspended()) lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); } if (TRACE_is_enabled()) { @@ -247,29 +239,26 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); - TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), + TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (lmm_variable_getvalue(action->getVariable()) * lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i)), action->getLastUpdate(), now - action->getLastUpdate()); } } - if (!lmm_get_number_of_cnst_from_var (maxminSystem_, action->getVariable())) { - /* There is actually no link used, hence an infinite bandwidth. - * This happens often when using models like vivaldi. - * In such case, just make sure that the action completes immediately. + if (not lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable())) { + /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like + * vivaldi. In such case, just make sure that the action completes immediately. */ action->updateRemains(action->getRemains()); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - - if (action->getMaxDuration() != NO_MAX_DURATION) + + if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); - + 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); - action->gapRemove(); + action->finish(Action::State::done); } } } @@ -281,21 +270,21 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz std::vector* back_route = nullptr; std::vector* route = new std::vector(); - XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), size, rate); + XBT_IN("(%s,%s,%g,%g)", src->getCname(), dst->getCname(), size, rate); src->routeTo(dst, route, &latency); - xbt_assert(!route->empty() || latency, + xbt_assert(not route->empty() || latency, "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", - src->cname(), dst->cname()); + src->getCname(), dst->getCname()); - for (auto link: *route) + for (auto const& link : *route) if (link->isOff()) failed = 1; if (sg_network_crosstraffic == 1) { back_route = new std::vector(); dst->routeTo(src, back_route, nullptr); - for (auto link: *back_route) + for (auto const& link : *back_route) if (link->isOff()) failed = 1; } @@ -311,10 +300,10 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz double bandwidth_bound = -1.0; if (sg_weight_S_parameter > 0) - for (auto link : *route) + for (auto const& link : *route) action->weight_ += sg_weight_S_parameter / link->bandwidth(); - for (auto link : *route) { + for (auto const& link : *route) { double bb = bandwidthFactor(size) * link->bandwidth(); bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } @@ -322,14 +311,6 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->latCurrent_ = action->latency_; action->latency_ *= latencyFactor(size); action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); - if (haveGap_) { - xbt_assert(! route->empty(), - "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); - - gapAppend(size, route->at(0), action); - XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_, - action->latency_); - } int constraints_per_variable = route->size(); if (back_route != nullptr) @@ -351,12 +332,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) : action->rate_); } - for (auto link: *route) + for (auto const& link : *route) lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), 1.0); if (back_route != nullptr) { // sg_network_crosstraffic was activated XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); - for (auto link : *back_route) + for (auto const& link : *back_route) lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), .05); //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency @@ -372,14 +353,10 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz return action; } -void NetworkCm02Model::gapAppend(double size, const LinkImpl* link, NetworkAction* action){ - // Nothing -}; - /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, +NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system) : LinkImpl(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) { @@ -395,9 +372,8 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, doub simgrid::s4u::Link::onCreation(this->piface_); } -void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) +void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) { - /* Find out which of my iterators was triggered, and react accordingly */ if (triggered == bandwidth_.event) { setBandwidth(value); @@ -441,7 +417,7 @@ void NetworkCm02Link::setBandwidth(double value) lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); - TRACE_surf_link_set_bandwidth(surf_get_clock(), cname(), sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); + TRACE_surf_link_set_bandwidth(surf_get_clock(), getCname(), sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); @@ -453,7 +429,7 @@ void NetworkCm02Link::setBandwidth(double value) while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) { NetworkCm02Action *action = static_cast(lmm_variable_id(var)); action->weight_ += delta; - if (!action->isSuspended()) + if (not action->isSuspended()) lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); } } @@ -486,19 +462,15 @@ void NetworkCm02Link::setLatency(double value) XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_); } } - if (!action->isSuspended()) + if (not action->isSuspended()) lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); } } -NetworkCm02Link::~NetworkCm02Link() {} - /********** * Action * **********/ -NetworkCm02Action::~NetworkCm02Action() {} - void NetworkCm02Action::updateRemainingLazy(double now) { if (suspended_ != 0) @@ -513,13 +485,12 @@ void NetworkCm02Action::updateRemainingLazy(double now) XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_); } - if (maxDuration_ != NO_MAX_DURATION) + if (maxDuration_ > NO_MAX_DURATION) double_update(&maxDuration_, delta, sg_surf_precision); if ((remains_ <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) || - (((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0)))){ - finish(); - setState(Action::State::done); + ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) { + finish(Action::State::done); heapRemove(getModel()->getActionHeap()); } @@ -527,8 +498,5 @@ void NetworkCm02Action::updateRemainingLazy(double now) lastValue_ = lmm_variable_getvalue(getVariable()); } -void NetworkCm02Link::gapAppend(double size, const LinkImpl* link, NetworkAction* action){ - // Nothing -}; } }