X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de190af4974a9ed57a52e649e5cbe0ac83512acb..ff3ef77d2ef796e7e5e8c384672f3057997cec4b:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index ccd09c7e91..4fde97afa7 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -3,10 +3,12 @@ /* 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. */ +#include +#include + #include "network_cm02.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.hpp" -#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -38,9 +40,9 @@ void surf_network_model_init_LegrandVelho() surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); all_existing_models->push_back(surf_network_model); - 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); } /***************************************************************************/ @@ -56,13 +58,12 @@ void surf_network_model_init_LegrandVelho() /* } */ void surf_network_model_init_CM02() { - if (surf_network_model) return; - 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); + simgrid::config::set_default("network/latency-factor", 1.0); + simgrid::config::set_default("network/bandwidth-factor", 1.0); + simgrid::config::set_default("network/weight-S", 0.0); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); all_existing_models->push_back(surf_network_model); @@ -86,9 +87,9 @@ void surf_network_model_init_Reno() using namespace simgrid::kernel; lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); @@ -103,9 +104,9 @@ void surf_network_model_init_Reno2() using namespace simgrid::kernel; lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi); - 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); @@ -119,9 +120,9 @@ void surf_network_model_init_Vegas() using namespace simgrid::kernel; lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); - 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); @@ -132,13 +133,14 @@ namespace kernel { namespace resource { NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) - : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? Model::UpdateAlgo::Full : Model::UpdateAlgo::Lazy) + : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::Full + : Model::UpdateAlgo::Lazy) { - std::string optim = xbt_cfg_get_string("network/optim"); - bool select = simgrid::config::get_config("network/maxmin-selective-update"); + std::string optim = simgrid::config::get_value("network/optim"); + bool select = simgrid::config::get_value("network/maxmin-selective-update"); if (optim == "Lazy") { - xbt_assert(select || xbt_cfg_is_default_value("network/maxmin-selective-update"), + xbt_assert(select || simgrid::config::is_default("network/maxmin-selective-update"), "You cannot disable network selective update when using the lazy update mechanism"); select = true; } @@ -159,17 +161,6 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) NetworkCm02Action* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); - if (TRACE_is_enabled()) { - int n = action->get_variable()->get_number_of_constraint(); - - for (int i = 0; i < n; i++){ - kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); - NetworkCm02Link* link = static_cast(constraint->get_id()); - double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); - TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), value, action->get_last_update(), - now - action->get_last_update()); - } - } // if I am wearing a latency hat if (action->get_type() == ActionHeap::Type::latency) { @@ -207,17 +198,7 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) if (action.latency_ <= 0.0 && not action.is_suspended()) get_maxmin_system()->update_variable_weight(action.get_variable(), action.weight_); } - if (TRACE_is_enabled()) { - int n = action.get_variable()->get_number_of_constraint(); - for (int i = 0; i < n; i++) { - kernel::lmm::Constraint* constraint = action.get_variable()->get_constraint(i); - NetworkCm02Link* link = static_cast(constraint->get_id()); - TRACE_surf_link_set_utilization( - link->get_cname(), action.get_category(), - (action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i)), - action.get_last_update(), now - action.get_last_update()); - } - } + if (not action.get_variable()->get_number_of_constraint()) { /* 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. @@ -238,7 +219,6 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - int failed = 0; double latency = 0.0; std::vector back_route; std::vector route; @@ -250,15 +230,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", src->get_cname(), dst->get_cname()); - for (auto const& link : route) - if (link->is_off()) - failed = 1; + bool failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); }); - if (cfg_crosstraffic == 1) { + if (cfg_crosstraffic) { dst->routeTo(src, back_route, nullptr); - for (auto const& link : back_route) - if (link->is_off()) - failed = 1; + if (not failed) + failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); }); } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); @@ -269,16 +246,18 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->set_last_update(); } - double bandwidth_bound = -1.0; - if (sg_weight_S_parameter > 0) - for (auto const& link : route) - action->weight_ += sg_weight_S_parameter / link->bandwidth(); - - for (auto const& link : route) { - double bb = bandwidthFactor(size) * link->bandwidth(); - bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); + if (sg_weight_S_parameter > 0) { + action->weight_ = + std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) { + return total + sg_weight_S_parameter / link->bandwidth(); + }); } + double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth(); + + for (auto const& link : route) + bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth()); + action->lat_current_ = action->latency_; action->latency_ *= latencyFactor(size); action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); @@ -291,11 +270,8 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz if (get_update_algorithm() == Model::UpdateAlgo::Lazy) { // add to the heap the event when the latency is payed double date = action->latency_ + action->get_last_update(); - ActionHeap::Type type; - if (route.empty()) - type = ActionHeap::Type::normal; - else - type = ActionHeap::Type::latency; + + ActionHeap::Type type = route.empty() ? ActionHeap::Type::normal : ActionHeap::Type::latency; XBT_DEBUG("Added action (%p) one latency event at date %f", action, date); get_action_heap().insert(action, date, type); @@ -316,8 +292,8 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz for (auto const& link : route) get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); - if (not back_route.empty()) { // cfg_crosstraffic was activated - XBT_DEBUG("Crosstraffic active adding backward flow using 5%%"); + if (cfg_crosstraffic) { + XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); for (auto const& link : back_route) get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05); @@ -327,7 +303,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } XBT_OUT(); - simgrid::s4u::Link::onCommunicate(action, src, dst); + simgrid::s4u::Link::on_communicate(action, src, dst); return action; } @@ -347,7 +323,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam if (policy == s4u::Link::SharingPolicy::FATPIPE) get_constraint()->unshare(); - simgrid::s4u::Link::onCreation(this->piface_); + simgrid::s4u::Link::on_creation(this->piface_); } void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) @@ -394,8 +370,8 @@ void NetworkCm02Link::setBandwidth(double value) get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); - TRACE_surf_link_set_bandwidth(surf_get_clock(), get_cname(), - sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); + + LinkImpl::on_bandwidth_change(); if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale);