X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..c967cf616fe1b1eb28db36f9b1e823b5f6e6e8b9:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index c8f084c9a7..a6b00b46f9 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2020. 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. */ @@ -87,7 +87,9 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b } set_maxmin_system(make_new_lmm_system(select)); - loopback_ = NetworkCm02Model::create_link("__loopback__", std::vector(1, 498000000), 0.000015, + loopback_ = NetworkCm02Model::create_link("__loopback__", + std::vector{simgrid::config::get_value("network/loopback-bw")}, + simgrid::config::get_value("network/loopback-lat"), s4u::Link::SharingPolicy::FATPIPE); } @@ -104,7 +106,6 @@ LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vect void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) { while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - auto* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); @@ -185,12 +186,33 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); } - auto* action = new NetworkCm02Action(this, size, failed); + NetworkWifiLink* src_wifi_link = nullptr; + NetworkWifiLink* dst_wifi_link = nullptr; + if (not route.empty() && route.at(0)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + src_wifi_link = static_cast(route.at(0)); + xbt_assert(src_wifi_link->get_host_rate(src) != -1, + "The route from %s to %s begins with the WIFI link %s, but the host %s does not seem attached to that " + "WIFI link. Did you call link->set_host_rate()?", + src->get_cname(), dst->get_cname(), src_wifi_link->get_cname(), src->get_cname()); + } + if (route.size() > 1 && route.at(route.size() - 1)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + dst_wifi_link = static_cast(route.at(route.size() - 1)); + xbt_assert(dst_wifi_link->get_host_rate(dst) != -1, + "The route from %s to %s ends with the WIFI link %s, but the host %s does not seem attached to that " + "WIFI link. Did you call link->set_host_rate()?", + src->get_cname(), dst->get_cname(), dst_wifi_link->get_cname(), dst->get_cname()); + } + + NetworkCm02Action* action; + if (src_wifi_link == nullptr && dst_wifi_link == nullptr) + action = new NetworkCm02Action(this, *src, *dst, size, failed); + else + action = new NetworkWifiAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link); action->sharing_penalty_ = latency; action->latency_ = latency; action->rate_ = rate; - if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { + if (is_update_lazy()) { action->set_last_update(); } @@ -215,7 +237,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz if (action->latency_ > 0) { action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); - if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { + if (is_update_lazy()) { // add to the heap the event when the latency is payed double date = action->latency_ + action->get_last_update(); @@ -237,20 +259,19 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz : action->rate_); } + if (src_wifi_link != nullptr) + get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), + 1.0 / src_wifi_link->get_host_rate(src)); + if (dst_wifi_link != nullptr) + get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), + 1.0 / dst_wifi_link->get_host_rate(dst)); + for (auto const& link : route) { - // Handle WIFI links + // WIFI links are handled manually just above, so skip them now if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { - NetworkWifiLink* wifi_link = static_cast(link); - - double wifi_rate = wifi_link->get_host_rate(src); - if (wifi_rate == -1.0) - wifi_rate = wifi_link->get_host_rate(dst); - xbt_assert(wifi_rate != -1.0, - "None of the source (%s) or destination (%s) is connected to the Access Point '%s'. " - "Please use set_host_rate() on all stations.", - src->get_cname(), dst->get_cname(), link->get_cname()); - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / wifi_rate); - + xbt_assert(link == src_wifi_link || link == dst_wifi_link, + "Wifi links can only occure at the beginning of the route (meaning that it's attached to the src) or " + "at its end (meaning that it's attached to the dst"); } else { get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); } @@ -258,35 +279,22 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz if (cfg_crosstraffic) { XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); - bool wifi_dst_assigned = false; // Used by wifi crosstraffic - for (auto const& link : back_route) { - if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { - NetworkWifiLink* wifi_link = static_cast(link); - /** - * For wifi links we should add 0.05/rate. - * However since we are using the "back_route" we should encounter in - * the first place the dst wifi link. - */ - if (!wifi_dst_assigned && (wifi_link->get_host_rate(dst) != -1)) { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), - .05 / wifi_link->get_host_rate(dst)); - wifi_dst_assigned = true; - } else { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), - .05 / wifi_link->get_host_rate(src)); - } - } else { + if (dst_wifi_link != nullptr) + get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), + .05 / dst_wifi_link->get_host_rate(dst)); + if (src_wifi_link != nullptr) + get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), + .05 / src_wifi_link->get_host_rate(src)); + for (auto const& link : back_route) + if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05); - } - } - // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency()) // action->getVariable()->set_concurrency_share(2) } XBT_OUT(); - simgrid::s4u::Link::on_communicate(*action, src, dst); + simgrid::s4u::Link::on_communicate(*action); return action; } @@ -346,7 +354,7 @@ void NetworkCm02Link::set_bandwidth(double value) if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); - kernel::lmm::Variable* var; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; @@ -362,7 +370,7 @@ void NetworkCm02Link::set_bandwidth(double value) void NetworkCm02Link::set_latency(double value) { double delta = value - latency_.peak; - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; int numelem = 0;