X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78cf63c4e0797bb270e0e809f7cb41d9d598c214..596e36117322c22fd31372e7803bc197bcd4a016:/src/kernel/routing/StarZone.cpp diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp index b91248d783..3ccb8888ba 100644 --- a/src/kernel/routing/StarZone.cpp +++ b/src/kernel/routing/StarZone.cpp @@ -1,23 +1,21 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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 "simgrid/kernel/routing/StarZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/RoutedZone.hpp" -#include "src/surf/network_interface.hpp" +#include "src/kernel/resource/NetworkModel.hpp" #include "xbt/string.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_star, surf, "Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_star, ker_platform, "Kernel Star Routing"); namespace simgrid { -namespace kernel { -namespace routing { +namespace kernel::routing { StarZone::StarZone(const std::string& name) : ClusterZone(name) {} -void StarZone::add_links_to_route(const std::vector& links, Route* route, double* latency, - std::unordered_set& added_links) const +void StarZone::add_links_to_route(const std::vector& links, Route* route, double* latency, + std::unordered_set& added_links) const { for (auto* link : links) { /* do not add duplicated links in route->link_list_ */ @@ -29,12 +27,12 @@ void StarZone::add_links_to_route(const std::vector& links, void StarZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency) { - XBT_VERB("StarZone getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), + XBT_VERB("StarZone getLocalRoute from '%s'[%lu] to '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); const auto& src_route = routes_.at(src->id()); const auto& dst_route = routes_.at(dst->id()); - std::unordered_set added_links; + std::unordered_set added_links; /* loopback */ if (src == dst && src_route.has_loopback()) { add_links_to_route(src_route.loopback, route, latency, added_links); @@ -64,8 +62,9 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::mapid()].gateway ? routes_[src->id()].gateway->get_cname() : src->get_cname(); + xbt_node_t src_node = new_xbt_graph_node(graph, src_name, nodes); /* going up */ - xbt_node_t src_node = new_xbt_graph_node(graph, src->get_cname(), nodes); xbt_node_t previous = src_node; for (auto const* link : routes_[src->id()].links_up) { xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes); @@ -77,10 +76,10 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::mapid()].links_down) { xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes); - new_xbt_graph_edge(graph, current, previous, edges); + new_xbt_graph_edge(graph, previous, current, edges); previous = current; } - new_xbt_graph_edge(graph, src_node, previous, edges); + new_xbt_graph_edge(graph, previous, src_node, edges); } } @@ -111,7 +110,7 @@ void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, c src->get_cname(), gw_src->get_cname())); const auto* netzone_src = get_netzone_recursive(src); - if (not netzone_src->is_component_recursive(gw_src)) + if (not netzone_src || not netzone_src->is_component_recursive(gw_src)) throw std::invalid_argument(xbt::string_printf( "Invalid NetzoneRoute from %s@%s to %s: gw_src %s belongs to %s, not to %s.", src_name, gw_src->get_cname(), dst_name, gw_src->get_cname(), gw_src->get_englobing_zone()->get_cname(), src_name)); @@ -127,7 +126,7 @@ void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, c dst->get_cname(), gw_dst->get_cname())); const auto* netzone_dst = get_netzone_recursive(dst); - if (not netzone_dst->is_component_recursive(gw_dst)) + if (not netzone_dst || not netzone_dst->is_component_recursive(gw_dst)) throw std::invalid_argument(xbt::string_printf( "Invalid NetzoneRoute from %s@%s to %s: gw_dst %s belongs to %s, not to %s.", dst_name, gw_dst->get_cname(), src_name, gw_dst->get_cname(), gw_dst->get_englobing_zone()->get_cname(), dst_name)); @@ -135,32 +134,31 @@ void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, c } void StarZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - const std::vector& link_list_, bool symmetrical) + const std::vector& link_list, bool symmetrical) { check_add_route_param(src, dst, gw_src, gw_dst, symmetrical); - s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list_); - /* loopback */ if (src == dst) { - routes_[src->id()].loopback = link_list_; + routes_[src->id()].loopback = get_link_list_impl(link_list, false); } else { /* src to everyone */ if (src) { auto& route = routes_[src->id()]; - route.links_up = link_list_; + route.links_up = get_link_list_impl(link_list, false); route.gateway = gw_src; route.links_up_set = true; if (symmetrical) { + auto links_down = get_link_list_impl(link_list, true); /* reverse it for down/symmetrical links */ - route.links_down.assign(link_list_.rbegin(), link_list_.rend()); + route.links_down.assign(links_down.rbegin(), links_down.rend()); route.links_down_set = true; } } /* dst to everyone */ if (dst) { auto& route = routes_[dst->id()]; - route.links_down = link_list_; + route.links_down = get_link_list_impl(link_list, false); route.gateway = gw_dst; route.links_down_set = true; } @@ -171,16 +169,15 @@ void StarZone::do_seal() { /* add default empty links if nothing was configured by user */ for (auto const& node : get_vertices()) { - auto route = routes_.emplace(node->id(), StarRoute()); - if (route.second) { - route.first->second.links_down_set = true; - route.first->second.links_up_set = true; + auto [route, inserted] = routes_.try_emplace(node->id()); + if (inserted) { + route->second.links_down_set = true; + route->second.links_up_set = true; } } } -} // namespace routing -} // namespace kernel +} // namespace kernel::routing namespace s4u { NetZone* create_star_zone(const std::string& name)