X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..3056e7eed34d3b9ec18341b4c4279071bc6b428c:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 27b98cbc55..52ebc62c91 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -3,6 +3,9 @@ /* 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" @@ -35,12 +38,12 @@ void surf_network_model_init_LegrandVelho() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); + 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); } /***************************************************************************/ @@ -60,11 +63,11 @@ 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::surf::NetworkCm02Model(); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); all_existing_models->push_back(surf_network_model); } @@ -86,11 +89,11 @@ 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::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } @@ -103,11 +106,11 @@ 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::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } @@ -119,36 +122,37 @@ 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::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) - : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? kernel::resource::Model::UpdateAlgo::Full - : kernel::resource::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 = xbt_cfg_get_boolean("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; } set_maxmin_system(make_new_lmm_system(select)); - loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); + loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); } LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) + s4u::Link::SharingPolicy policy) { return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system()); } @@ -172,19 +176,18 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) } // if I am wearing a latency hat - if (action->get_type() == kernel::resource::ActionHeap::Type::latency) { + if (action->get_type() == ActionHeap::Type::latency) { XBT_DEBUG("Latency paid for action %p. Activating", action); get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); get_action_heap().remove(action); action->set_last_update(); // if I am wearing a max_duration or normal hat - } else if (action->get_type() == kernel::resource::ActionHeap::Type::max_duration || - action->get_type() == kernel::resource::ActionHeap::Type::normal) { + } else if (action->get_type() == ActionHeap::Type::max_duration || action->get_type() == ActionHeap::Type::normal) { // no need to communicate anymore // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); - action->finish(kernel::resource::Action::State::done); + action->finish(Action::State::done); get_action_heap().remove(action); } } @@ -232,14 +235,14 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { - action.finish(kernel::resource::Action::State::done); + action.finish(Action::State::done); } } } -kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - int failed = 0; + bool failed = false; double latency = 0.0; std::vector back_route; std::vector route; @@ -251,35 +254,33 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos "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; + 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; + failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); }); } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); action->weight_ = latency; action->latency_ = latency; action->rate_ = rate; - if (get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { + if (get_update_algorithm() == Model::UpdateAlgo::Lazy) { 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); @@ -289,14 +290,11 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos if (action->latency_ > 0) { action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); - if (get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { + 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(); - kernel::resource::ActionHeap::Type type; - if (route.empty()) - type = kernel::resource::ActionHeap::Type::normal; - else - type = kernel::resource::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); @@ -317,8 +315,8 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos 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); @@ -336,7 +334,7 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos * Resource * ************/ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, kernel::lmm::System* system) + s4u::Link::SharingPolicy policy, kernel::lmm::System* system) : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) { bandwidth_.scale = 1.0; @@ -345,7 +343,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam latency_.scale = 1.0; latency_.peak = latency; - if (policy == SURF_LINK_FATPIPE) + if (policy == s4u::Link::SharingPolicy::FATPIPE) get_constraint()->unshare(); simgrid::s4u::Link::onCreation(this->piface_); @@ -372,12 +370,11 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) turn_off(); while ((var = get_constraint()->get_variable(&elem))) { - kernel::resource::Action* action = static_cast(var->get_id()); + Action* action = static_cast(var->get_id()); - if (action->get_state() == kernel::resource::Action::State::running || - action->get_state() == kernel::resource::Action::State::ready) { + if (action->get_state() == Action::State::running || action->get_state() == Action::State::ready) { action->set_finish_time(now); - action->set_state(kernel::resource::Action::State::failed); + action->set_state(Action::State::failed); } } } @@ -484,3 +481,4 @@ void NetworkCm02Action::update_remains_lazy(double now) } } +} // namespace simgrid