X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd1d252dcb7c973c332b5ed597b302e07d3e9f7d..3dd753cd9e46d794e00629d03183250aec4a17e4:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 398a61b558..29604a599f 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2021. 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. */ @@ -9,10 +9,10 @@ #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/network_wifi.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" #include #include @@ -40,8 +40,9 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or fro void surf_network_model_init_LegrandVelho() { auto net_model = std::make_shared("Network_LegrandVelho"); - simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); - simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); + 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); @@ -66,8 +67,9 @@ void surf_network_model_init_CM02() simgrid::config::set_default("network/weight-S", 0.0); auto net_model = std::make_shared("Network_CM02"); - simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); - simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + engine->get_netzone_root()->set_network_model(net_model); } namespace simgrid { @@ -127,7 +129,7 @@ void NetworkCm02Model::set_bw_factor_cb(const std::function& cb bw_factor_cb_ = cb; } -LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths) +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()); @@ -135,9 +137,9 @@ LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vect return link; } -LinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) +StandardLinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) { - auto link = new NetworkWifiLink(name, bandwidths, get_maxmin_system()); + auto link = new WifiLinkImpl(name, bandwidths, get_maxmin_system()); link->set_model(this); return link; } @@ -205,26 +207,36 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) 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 + const std::vector& route, + const std::vector& back_route) const { /* expand route links constraints for route and back_route */ - const NetworkWifiLink* src_wifi_link = nullptr; - const NetworkWifiLink* dst_wifi_link = nullptr; + 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()); + 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()); + dst_wifi_link = static_cast(route.back()); } /* 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)); + if (src_wifi_link != nullptr) { + /* In case of 0Mbps data rate, don't consider it in the LMM */ + if (src_wifi_link->get_host_rate(src) != 0) + get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), + 1.0 / src_wifi_link->get_host_rate(src)); + else + get_maxmin_system()->update_variable_penalty(action->get_variable(), 0); + } + if (dst_wifi_link != nullptr) { + if (dst_wifi_link->get_host_rate(dst) != 0) + get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), + 1.0 / dst_wifi_link->get_host_rate(dst)); + else { + get_maxmin_system()->update_variable_penalty(action->get_variable(), 0); + } + } for (auto const* link : route) { if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) @@ -251,20 +263,20 @@ void NetworkCm02Model::comm_action_expand_constraints(const s4u::Host* src, cons } NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Host* dst, double size, - const std::vector& route, bool failed) + const std::vector& route, bool failed) { - NetworkWifiLink* src_wifi_link = nullptr; - NetworkWifiLink* dst_wifi_link = nullptr; + 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()); + 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()); + 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()?", @@ -291,7 +303,7 @@ NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Hos 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 = new WifiLinkAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link); if (is_update_lazy()) { action->set_last_update(); @@ -301,7 +313,8 @@ NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Hos } bool NetworkCm02Model::comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, double& latency, - std::vector& route, std::vector& back_route, + 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, @@ -311,19 +324,18 @@ bool NetworkCm02Model::comm_get_route_info(const s4u::Host* src, const s4u::Host "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) { + if (not failed && 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; } void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, - NetworkCm02Action* action, const std::vector& route, + NetworkCm02Action* action, const std::vector& route, const std::unordered_set& netzones, double rate) { @@ -332,7 +344,8 @@ void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::H /* transform data to user structures if necessary */ if (lat_factor_cb_ || bw_factor_cb_) { - std::for_each(route.begin(), route.end(), [&s4u_route](LinkImpl* l) { s4u_route.push_back(l->get_iface()); }); + 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()); }); } @@ -372,8 +385,8 @@ void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::H } } -void NetworkCm02Model::comm_action_set_variable(NetworkCm02Action* action, const std::vector& route, - const std::vector& back_route) +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(); @@ -407,8 +420,8 @@ void NetworkCm02Model::comm_action_set_variable(NetworkCm02Action* action, const 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::vector back_route; + std::vector route; std::unordered_set netzones; XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); @@ -420,10 +433,10 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->latency_ = latency; 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(); - }); + 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 */ @@ -436,7 +449,6 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz comm_action_expand_constraints(src, dst, action, route, back_route); XBT_OUT(); - simgrid::s4u::Link::on_communicate(*action); return action; } @@ -444,7 +456,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz * Resource * ************/ NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, kernel::lmm::System* system) - : LinkImpl(name) + : StandardLinkImpl(name) { bandwidth_.scale = 1.0; bandwidth_.peak = bandwidth; @@ -462,12 +474,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 turn_off(); - tmgr_trace_event_unref(&state_event_); + unref_state_event(); } else { xbt_die("Unknown event!\n"); } @@ -483,7 +495,7 @@ void NetworkCm02Link::set_bandwidth(double value) 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 / (bandwidth_.peak * bandwidth_.scale) -