X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fdbc52907d138de71505e054454de0f33954598f..c19a107a096f503e67217fb178fa98eb742ceb4d:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 0e7d31becc..3265a9919c 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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. */ @@ -14,7 +14,7 @@ #include #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); 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 */ @@ -71,7 +71,7 @@ namespace simgrid { namespace kernel { namespace resource { -NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) +NetworkCm02Model::NetworkCm02Model() : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::FULL : Model::UpdateAlgo::LAZY) { @@ -86,7 +86,7 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b select = true; } - set_maxmin_system(make_new_lmm_system(select)); + set_maxmin_system(new lmm::System(select)); loopback_ = NetworkCm02Model::create_link("__loopback__", std::vector{simgrid::config::get_value("network/loopback-bw")}, simgrid::config::get_value("network/loopback-lat"), @@ -130,7 +130,7 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) { for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { - NetworkCm02Action& action = static_cast(*it); + auto& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it XBT_DEBUG("Something happened to action %p", &action); double deltap = delta; @@ -186,7 +186,35 @@ 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, *src, *dst, size, failed); + NetworkWifiLink* src_wifi_link = nullptr; + NetworkWifiLink* dst_wifi_link = nullptr; + if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + src_wifi_link = static_cast(route.front()); + 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.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + dst_wifi_link = static_cast(route.back()); + 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()); + } + if (route.size() > 2) + for (unsigned i = 1; i < route.size() - 1; i++) + xbt_assert(route[i]->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI, + "Link '%s' is a WIFI link. It can only be at the beginning or the end of the route from '%s' to '%s', " + "not in between (it is at position %u out of %zu). " + "Did you declare an access_point in your WIFI zones?", + route[i]->get_cname(), src->get_cname(), dst->get_cname(), i + 1, route.size()); + + 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; @@ -217,7 +245,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 (is_update_lazy()) { - // add to the heap the event when the latency is payed + // add to the heap the event when the latency is paid double date = action->latency_ + action->get_last_update(); ActionHeap::Type type = route.empty() ? ActionHeap::Type::normal : ActionHeap::Type::latency; @@ -238,20 +266,19 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz : action->rate_); } - for (auto const& link : route) { - // Handle WIFI links - 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); + 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) { + // WIFI links are handled manually just above, so skip them now + if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + xbt_assert(link == src_wifi_link || link == dst_wifi_link, + "Wifi links can only occur 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); } @@ -259,28 +286,15 @@ 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)