X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d5dde64a8201a55007ccc0bcc4f267facff8d30..c3119f83962a5b1ef7bc8f79011698c83ce21cda:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 88b131c5dd..4e6c8aad4f 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,7 +7,7 @@ #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 @@ -66,12 +65,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 +88,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 +104,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 +119,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 +138,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,11 +166,8 @@ NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) maxminSystem_->solve_fun = specificSolveFun; } - -NetworkCm02Model::~NetworkCm02Model() {} - -Link* NetworkCm02Model::createLink(const char* name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) +LinkImpl* NetworkCm02Model::createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxminSystem_); } @@ -191,8 +187,8 @@ 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->getName(), action->getCategory(), value, - action->getLastUpdate(), now - action->getLastUpdate()); + TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), value, action->getLastUpdate(), + now - action->getLastUpdate()); } } @@ -216,7 +212,6 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) action->gapRemove(); } } - return; } @@ -239,9 +234,8 @@ 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())) - lmm_update_variable_weight(maxminSystem_, action->getVariable(), - action->weight_); + if (action->latency_ <= 0.0 && not action->isSuspended()) + lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); } if (TRACE_is_enabled()) { int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); @@ -249,35 +243,25 @@ 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->getName(), - action->getCategory(), - (lmm_variable_getvalue(action->getVariable())* - lmm_get_cnst_weight_from_var(maxminSystem_, - action->getVariable(), - i)), - action->getLastUpdate(), - now - action->getLastUpdate()); + TRACE_surf_link_set_utilization(link->cname(), 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->finish(); - action->setState(Action::State::done); - action->gapRemove(); - } else if (((action->getMaxDuration() != NO_MAX_DURATION) - && (action->getMaxDuration() <= 0))) { + + 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(); @@ -288,26 +272,23 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { int failed = 0; - double bandwidth_bound; double latency = 0.0; - std::vector * back_route = nullptr; - int constraints_per_variable = 0; - - std::vector *route = new std::vector(); + std::vector* back_route = nullptr; + std::vector* route = new std::vector(); - XBT_IN("(%s,%s,%g,%g)", src->name().c_str(), dst->name().c_str(), size, rate); + XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), 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->name().c_str(), dst->name().c_str()); + src->cname(), dst->cname()); for (auto link: *route) if (link->isOff()) failed = 1; if (sg_network_crosstraffic == 1) { - back_route = new std::vector(); + back_route = new std::vector(); dst->routeTo(src, back_route, nullptr); for (auto link: *back_route) if (link->isOff()) @@ -315,15 +296,15 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); - action->weight_ = action->latency_ = latency; - + action->weight_ = latency; + action->latency_ = latency; action->rate_ = rate; if (updateMechanism_ == UM_LAZY) { action->indexHeap_ = -1; action->lastUpdate_ = surf_get_clock(); } - bandwidth_bound = -1.0; + double bandwidth_bound = -1.0; if (sg_weight_S_parameter > 0) for (auto link : *route) action->weight_ += sg_weight_S_parameter / link->bandwidth(); @@ -337,15 +318,15 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->latency_ *= latencyFactor(size); action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); if (haveGap_) { - xbt_assert(! route->empty(), + xbt_assert(not 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->name().c_str(), dst->name().c_str(), action->senderGap_, + XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_, action->latency_); } - constraints_per_variable = route->size(); + int constraints_per_variable = route->size(); if (back_route != nullptr) constraints_per_variable += back_route->size(); @@ -366,13 +347,13 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } for (auto link: *route) - lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), 1.0); + lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), 1.0); - if (sg_network_crosstraffic == 1) { + if (back_route != nullptr) { // sg_network_crosstraffic was activated XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); for (auto link : *back_route) - lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), .05); - + lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), .05); + //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency //(You would also have to change lmm_element_concurrency()) //lmm_variable_concurrency_share_set(action->getVariable(),2); @@ -382,13 +363,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz delete back_route; XBT_OUT(); - Link::onCommunicate(action, src, dst); + simgrid::s4u::Link::onCommunicate(action, src, dst); return action; } -void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action) -{ - // Nothing +void NetworkCm02Model::gapAppend(double size, const LinkImpl* link, NetworkAction* action){ + // Nothing }; /************ @@ -396,7 +376,7 @@ void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* a ************/ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system) - : Link(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) + : LinkImpl(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) { bandwidth_.scale = 1.0; bandwidth_.peak = bandwidth; @@ -405,16 +385,13 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, doub latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + lmm_constraint_shared(constraint()); - Link::onCreation(this); + 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); @@ -433,7 +410,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) double now = surf_get_clock(); turnOff(); - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { + while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { Action *action = static_cast( lmm_variable_id(var) ); if (action->getState() == Action::State::running || @@ -448,8 +425,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) xbt_die("Unknown event!\n"); } - XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", - getConstraint()); + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", constraint()); } void NetworkCm02Link::setBandwidth(double value) @@ -457,21 +433,22 @@ void NetworkCm02Link::setBandwidth(double value) bandwidth_.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), + lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); - TRACE_surf_link_set_bandwidth(surf_get_clock(), getName(), sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); + TRACE_surf_link_set_bandwidth(surf_get_clock(), cname(), 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); lmm_variable_t var; - lmm_element_t elem = nullptr, nextelem = nullptr; + lmm_element_t elem = nullptr; + lmm_element_t nextelem = nullptr; int numelem = 0; - while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { - NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); + 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()) - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_); + if (not action->isSuspended()) + lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); } } } @@ -486,14 +463,15 @@ void NetworkCm02Link::setLatency(double value) latency_.peak = value; - while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { - NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); + while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) { + NetworkCm02Action *action = static_cast(lmm_variable_id(var)); action->latCurrent_ += delta; action->weight_ += delta; if (action->rate_ < 0) - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), sg_tcp_gamma / (2.0 * action->latCurrent_)); + lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), + sg_tcp_gamma / (2.0 * action->latCurrent_)); else { - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), + lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) { @@ -502,27 +480,21 @@ void NetworkCm02Link::setLatency(double value) XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_); } } - if (!action->isSuspended()) - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_); + if (not action->isSuspended()) + lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); } } -NetworkCm02Link::~NetworkCm02Link() {} - /********** * Action * **********/ -NetworkCm02Action::~NetworkCm02Action() {} - void NetworkCm02Action::updateRemainingLazy(double now) { - double delta = 0.0; - if (suspended_ != 0) return; - delta = now - lastUpdate_; + double delta = now - lastUpdate_; if (remains_ > 0) { XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_); @@ -531,17 +503,11 @@ 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)) { - finish(); - setState(Action::State::done); - - heapRemove(getModel()->getActionHeap()); - } else if (((maxDuration_ != NO_MAX_DURATION) - && (maxDuration_ <= 0))) { + if ((remains_ <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) || + ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) { finish(); setState(Action::State::done); heapRemove(getModel()->getActionHeap()); @@ -551,10 +517,8 @@ void NetworkCm02Action::updateRemainingLazy(double now) lastValue_ = lmm_variable_getvalue(getVariable()); } -void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action) -{ - // Nothing +void NetworkCm02Link::gapAppend(double size, const LinkImpl* link, NetworkAction* action){ + // Nothing }; - } }