X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a15c64d854f8f8ecc35732c0534bd6cb4fb0bb8..ea74f5d95928a521a588737e81f1de94eef25d19:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index cf56363fe2..edcfb57239 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,23 +1,27 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2022. 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. */ -#include "network_cm02.hpp" +#include "src/surf/network_cm02.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" +#include "src/kernel/resource/WifiLinkImpl.hpp" #include "src/kernel/resource/profile/Event.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" #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 */ -double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ +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 */ +double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ /************************************************************************/ /* New model based on optimizations discussed during Pedro Velho's thesis*/ @@ -35,9 +39,10 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or /* } */ void surf_network_model_init_LegrandVelho() { - xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - - surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); + auto net_model = std::make_shared("Network_LegrandVelho"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + engine->get_netzone_root()->set_network_model(net_model); simgrid::config::set_default("network/latency-factor", 13.01); simgrid::config::set_default("network/bandwidth-factor", 0.97); @@ -57,53 +62,91 @@ void surf_network_model_init_LegrandVelho() /* } */ void surf_network_model_init_CM02() { - xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - 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(); + auto net_model = std::make_shared("Network_CM02"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + engine->get_netzone_root()->set_network_model(net_model); } namespace simgrid { namespace kernel { namespace resource { -NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) - : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::FULL - : Model::UpdateAlgo::LAZY) +NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name) { - all_existing_models.push_back(this); - - std::string optim = simgrid::config::get_value("network/optim"); - bool select = simgrid::config::get_value("network/maxmin-selective-update"); + std::string optim = config::get_value("network/optim"); + bool select = config::get_value("network/maxmin-selective-update"); if (optim == "Lazy") { - xbt_assert(select || simgrid::config::is_default("network/maxmin-selective-update"), + set_update_algorithm(Model::UpdateAlgo::LAZY); + xbt_assert(select || 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::create_link("__loopback__", std::vector(1, 498000000), 0.000015, - s4u::Link::SharingPolicy::FATPIPE); + set_maxmin_system(new lmm::System(select)); + loopback_ = create_link("__loopback__", {config::get_value("network/loopback-bw")}); + loopback_->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE, {}); + loopback_->set_latency(config::get_value("network/loopback-lat")); + loopback_->seal(); +} + +void NetworkCm02Model::check_lat_factor_cb() +{ + if (not simgrid::config::is_default("network/latency-factor")) { + throw std::invalid_argument( + "NetworkModelIntf: Cannot mix network/latency-factor and callback configuration. Choose only one of them."); + } } -LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy policy) +void NetworkCm02Model::check_bw_factor_cb() { - if (policy == s4u::Link::SharingPolicy::WIFI) { - return (new NetworkWifiLink(this, name, bandwidths, policy, get_maxmin_system())); + if (not simgrid::config::is_default("network/bandwidth-factor")) { + throw std::invalid_argument( + "NetworkModelIntf: Cannot mix network/bandwidth-factor and callback configuration. Choose only one of them."); } - xbt_assert(bandwidths.size() == 1, "Non WIFI links must use only 1 bandwidth."); - return new NetworkCm02Link(this, name, bandwidths[0], latency, policy, get_maxmin_system()); +} + +void NetworkCm02Model::set_lat_factor_cb(const std::function& cb) +{ + if (not cb) + throw std::invalid_argument("NetworkModelIntf: Invalid callback"); + check_lat_factor_cb(); + + lat_factor_cb_ = cb; +} + +void NetworkCm02Model::set_bw_factor_cb(const std::function& cb) +{ + if (not cb) + throw std::invalid_argument("NetworkModelIntf: Invalid callback"); + check_bw_factor_cb(); + + bw_factor_cb_ = cb; +} + +StandardLinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths) +{ + xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth."); + auto link = new NetworkCm02Link(name, bandwidths[0], get_maxmin_system()); + link->set_model(this); + return link; +} + +StandardLinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) +{ + auto link = new WifiLinkImpl(name, bandwidths, get_maxmin_system()); + link->set_model(this); + return link; } 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); @@ -128,7 +171,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; @@ -150,7 +193,7 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) */ action.update_remains(action.get_remains()); } - action.update_remains(action.get_variable()->get_value() * delta); + action.update_remains(action.get_rate() * delta); if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); @@ -162,60 +205,187 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) } } -Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +void NetworkCm02Model::comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, + const NetworkCm02Action* action, + const std::vector& route, + const std::vector& back_route) const { - double latency = 0.0; - std::vector back_route; - std::vector route; + /* expand route links constraints for route and back_route */ + const WifiLinkImpl* src_wifi_link = nullptr; + const WifiLinkImpl* dst_wifi_link = nullptr; + if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + src_wifi_link = static_cast(route.front()); + } + if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + dst_wifi_link = static_cast(route.back()); + } - XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); + /* WI-FI links needs special treatment, do it here */ + 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) { + if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); + } + + if (cfg_crosstraffic) { + XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); + 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) + } +} + +NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Host* dst, double size, + const std::vector& route, bool failed) +{ + WifiLinkImpl* src_wifi_link = nullptr; + WifiLinkImpl* dst_wifi_link = nullptr; + /* many checks related to Wi-Fi links */ + 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()); + + for (auto const* link : route) { + 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"); + } + } + + /* create action and do some initializations */ + NetworkCm02Action* action; + if (src_wifi_link == nullptr && dst_wifi_link == nullptr) + action = new NetworkCm02Action(this, *src, *dst, size, failed); + else + action = new WifiLinkAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link); + + if (is_update_lazy()) { + action->set_last_update(); + } + + return action; +} + +bool NetworkCm02Model::comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, double& latency, + std::vector& route, + std::vector& back_route, + std::unordered_set& netzones) const +{ + kernel::routing::NetZoneImpl::get_global_route_with_netzones(src->get_netpoint(), dst->get_netpoint(), route, + &latency, netzones); - src->route_to(dst, route, &latency); xbt_assert(not route.empty() || latency > 0, "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()); - bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); }); + bool failed = std::any_of(route.begin(), route.end(), [](const StandardLinkImpl* link) { return not link->is_on(); }); if (cfg_crosstraffic) { dst->route_to(src, back_route, nullptr); if (not failed) - failed = - std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); + failed = std::any_of(back_route.begin(), back_route.end(), + [](const StandardLinkImpl* link) { return not link->is_on(); }); } + return failed; +} - auto* action = new NetworkCm02Action(this, size, failed); - action->sharing_penalty_ = latency; - action->latency_ = latency; - action->rate_ = rate; - - if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { - action->set_last_update(); +void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, + NetworkCm02Action* action, const std::vector& route, + const std::unordered_set& netzones, + double rate) +{ + std::vector s4u_route; + std::unordered_set s4u_netzones; + + /* transform data to user structures if necessary */ + if (lat_factor_cb_ || bw_factor_cb_) { + std::for_each(route.begin(), route.end(), + [&s4u_route](StandardLinkImpl* l) { s4u_route.push_back(l->get_iface()); }); + std::for_each(netzones.begin(), netzones.end(), + [&s4u_netzones](kernel::routing::NetZoneImpl* n) { s4u_netzones.insert(n->get_iface()); }); } - - if (sg_weight_S_parameter > 0) { - action->sharing_penalty_ = - std::accumulate(route.begin(), route.end(), action->sharing_penalty_, [](double total, LinkImpl* const& link) { - return total + sg_weight_S_parameter / link->get_bandwidth(); - }); + double bw_factor; + if (bw_factor_cb_) { + bw_factor = bw_factor_cb_(size, src, dst, s4u_route, s4u_netzones); + } else { + bw_factor = get_bandwidth_factor(size); + } + xbt_assert(bw_factor != 0, "Invalid param for comm %s -> %s. Bandwidth factor cannot be 0", src->get_cname(), + dst->get_cname()); + action->set_rate_factor(bw_factor); + + /* get mininum bandwidth among links in the route and multiply by correct factor + * ignore wi-fi links, they're not considered for bw_factors */ + double bandwidth_bound = -1.0; + for (const auto* l : route) { + if (l->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) + continue; + if (bandwidth_bound == -1.0 || l->get_bandwidth() < bandwidth_bound) + bandwidth_bound = l->get_bandwidth(); } - double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth(); - - for (auto const& link : route) - bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth()); + /* increase rate given by user considering the factor, since the actual rate will be + * modified by it */ + rate = rate / bw_factor; + /* the bandwidth is determined by the minimum between flow and user's defined rate */ + if (rate >= 0 && rate < bandwidth_bound) + bandwidth_bound = rate; + action->set_user_bound(bandwidth_bound); action->lat_current_ = action->latency_; - action->latency_ *= get_latency_factor(size); - action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size); + if (lat_factor_cb_) { + action->latency_ *= lat_factor_cb_(size, src, dst, s4u_route, s4u_netzones); + } else { + action->latency_ *= get_latency_factor(size); + } +} +void NetworkCm02Model::comm_action_set_variable(NetworkCm02Action* action, const std::vector& route, + const std::vector& back_route) +{ size_t constraints_per_variable = route.size(); constraints_per_variable += back_route.size(); 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) { - // add to the heap the event when the latency is payed + if (is_update_lazy()) { + // 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; @@ -226,76 +396,62 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } else action->set_variable(get_maxmin_system()->variable_new(action, 1.0, -1.0, constraints_per_variable)); - if (action->rate_ < 0) { + /* after setting the variable, update the bounds depending on user configuration */ + if (action->get_user_bound() < 0) { get_maxmin_system()->update_variable_bound( action->get_variable(), (action->lat_current_ > 0) ? cfg_tcp_gamma / (2.0 * action->lat_current_) : -1.0); } else { get_maxmin_system()->update_variable_bound( action->get_variable(), (action->lat_current_ > 0) - ? std::min(action->rate_, cfg_tcp_gamma / (2.0 * action->lat_current_)) - : action->rate_); + ? std::min(action->get_user_bound(), cfg_tcp_gamma / (2.0 * action->lat_current_)) + : action->get_user_bound()); } +} - for (auto const& link : route) { - // Handle WIFI links - if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { - NetworkWifiLink* wifi_link = static_cast(link); +Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +{ + double latency = 0.0; + std::vector back_route; + std::vector route; + std::unordered_set netzones; - double src_rate = wifi_link->get_host_rate(src); - double dst_rate = wifi_link->get_host_rate(dst); + XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); - if (src_rate != -1 && dst_rate != -1) { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate); - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate); - } else { - xbt_assert( - !(src_rate == -1 && dst_rate == -1), - "Some Stations are not associated to any Access Point. Make sure to call set_host_rate on all Stations."); - if (src_rate != -1) - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate); - else - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate); - } - } else { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); - } - } + bool failed = comm_get_route_info(src, dst, latency, route, back_route, netzones); - if (cfg_crosstraffic) { - XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); - for (auto const& link : back_route) { - // Do not add crosstraffic on WIFI links - if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05); - } + NetworkCm02Action* action = comm_action_create(src, dst, size, route, failed); + action->sharing_penalty_ = latency; + action->latency_ = latency; - // 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) + if (sg_weight_S_parameter > 0) { + action->sharing_penalty_ = std::accumulate(route.begin(), route.end(), action->sharing_penalty_, + [](double total, StandardLinkImpl* const& link) { + return total + sg_weight_S_parameter / link->get_bandwidth(); + }); } + + /* setting bandwidth and latency bounds considering route and configured bw/lat factors */ + comm_action_set_bounds(src, dst, size, action, route, netzones, rate); + + /* creating the maxmin variable associated to this action */ + comm_action_set_variable(action, route, back_route); + + /* expand maxmin system to consider this communication in bw constraint for each link in route and back_route */ + comm_action_expand_constraints(src, dst, action, route, back_route); XBT_OUT(); - simgrid::s4u::Link::on_communicate(*action, src, dst); return action; } /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy, kernel::lmm::System* system) - : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) +NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, kernel::lmm::System* system) + : StandardLinkImpl(name) { bandwidth_.scale = 1.0; bandwidth_.peak = bandwidth; - - latency_.scale = 1.0; - latency_.peak = latency; - - if (policy == s4u::Link::SharingPolicy::FATPIPE) - get_constraint()->unshare(); - - simgrid::s4u::Link::on_creation(this->piface_); + this->set_constraint(system->constraint_new(this, bandwidth)); } void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value) @@ -309,13 +465,12 @@ void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double valu set_latency(value); tmgr_trace_event_unref(&latency_.event); - } else if (triggered == state_event_) { + } else if (triggered == get_state_event()) { if (value > 0) turn_on(); - else { + else turn_off(); - } - tmgr_trace_event_unref(&state_event_); + unref_state_event(); } else { xbt_die("Unknown event!\n"); } @@ -326,21 +481,21 @@ void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double valu void NetworkCm02Link::set_bandwidth(double value) { + double old_peak = bandwidth_.peak; bandwidth_.peak = value; - get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), - sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), (bandwidth_.peak * bandwidth_.scale)); - LinkImpl::on_bandwidth_change(); + StandardLinkImpl::on_bandwidth_change(); if (sg_weight_S_parameter > 0) { - double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); + double delta = sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale) - + sg_weight_S_parameter / (old_peak * bandwidth_.scale); - kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; - int numelem = 0; - while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + size_t numelem = 0; + while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) { auto* action = static_cast(var->get_id()); action->sharing_penalty_ += delta; if (not action->is_suspended()) @@ -351,29 +506,32 @@ void NetworkCm02Link::set_bandwidth(double value) void NetworkCm02Link::set_latency(double value) { - double delta = value - latency_.peak; - kernel::lmm::Variable* var = nullptr; + latency_check(value); + + double delta = value - latency_.peak; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; - int numelem = 0; + size_t numelem = 0; - latency_.peak = value; + latency_.scale = 1.0; + latency_.peak = value; - while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) { auto* action = static_cast(var->get_id()); action->lat_current_ += delta; action->sharing_penalty_ += delta; - if (action->rate_ < 0) + if (action->get_user_bound() < 0) get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)); else { get_model()->get_maxmin_system()->update_variable_bound( - action->get_variable(), std::min(action->rate_, NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_))); + action->get_variable(), + std::min(action->get_user_bound(), NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_))); - if (action->rate_ < NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)) { - XBT_INFO("Flow is limited BYBANDWIDTH"); + if (action->get_user_bound() < NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)) { + XBT_DEBUG("Flow is limited BYBANDWIDTH"); } else { - XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_); + XBT_DEBUG("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_); } } if (not action->is_suspended()) @@ -381,45 +539,6 @@ void NetworkCm02Link::set_latency(double value) } } -NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector bandwidths, - s4u::Link::SharingPolicy policy, lmm::System* system) - : NetworkCm02Link( - model, name, 1 / sg_bandwidth_factor, 0, policy, - system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system -{ - for (auto bandwidth : bandwidths) { - bandwidths_.push_back({bandwidth, 1.0, nullptr}); - } -} - -void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level) -{ - auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level)); - if (insert_done.second == false) - insert_done.first->second = rate_level; -} - -double NetworkWifiLink::get_host_rate(sg_host_t host) -{ - std::map::iterator host_rates_it; - host_rates_it = host_rates_.find(host->get_name()); - - if (host_rates_it == host_rates_.end()) - return -1; - - int rate_id = host_rates_it->second; - xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host \"%s\" has an invalid rate \"%d\"", - host->get_name().c_str(), rate_id); - - Metric rate = bandwidths_[rate_id]; - return rate.peak * rate.scale; -} - -s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() -{ - return s4u::Link::SharingPolicy::WIFI; -} - /********** * Action * **********/ @@ -448,7 +567,7 @@ void NetworkCm02Action::update_remains_lazy(double now) } set_last_update(); - set_last_value(get_variable()->get_value()); + set_last_value(get_rate()); } } // namespace resource