X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da82494b57755f7709200dec34441cad787ddde2..ea74f5d95928a521a588737e81f1de94eef25d19:/src/kernel/routing/StarZone.cpp diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp index b87c24831b..e180ff03ac 100644 --- a/src/kernel/routing/StarZone.cpp +++ b/src/kernel/routing/StarZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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. */ @@ -6,10 +6,7 @@ #include "simgrid/kernel/routing/StarZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/RoutedZone.hpp" -#include "src/surf/network_interface.hpp" -#if SIMGRID_HAVE_NS3 -#include "src/surf/network_ns3.hpp" -#endif +#include "src/kernel/resource/StandardLinkImpl.hpp" #include "xbt/string.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_star, surf, "Routing part of surf"); @@ -17,29 +14,27 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_star, surf, "Routing part of surf"); namespace simgrid { namespace kernel { namespace routing { -StarZone::StarZone(const std::string& name) : NetZoneImpl(name) {} +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_ */ if (not added_links.insert(link).second) continue; - if (latency) - *latency += link->get_latency(); - route->link_list_.push_back(link); + add_link_latency(route->link_list_, link, latency); } } -void StarZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* latency) +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); @@ -82,10 +77,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, previous, current, edges); + new_xbt_graph_edge(graph, current, previous, edges); previous = current; } - new_xbt_graph_edge(graph, previous, src_node, edges); + new_xbt_graph_edge(graph, src_node, previous, edges); } } @@ -114,6 +109,12 @@ void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, c throw std::invalid_argument( xbt::string_printf("StarZone::add_route(): src(%s) is a netzone, gw_src(%s) cannot be a netzone", src->get_cname(), gw_src->get_cname())); + + const auto* netzone_src = get_netzone_recursive(src); + if (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)); } if (dst && dst->is_netzone()) { @@ -124,36 +125,41 @@ void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, c throw std::invalid_argument( xbt::string_printf("StarZone::add_route(): dst(%s) is a netzone, gw_dst(%s) cannot be a netzone", dst->get_cname(), gw_dst->get_cname())); + + const auto* netzone_dst = get_netzone_recursive(dst); + if (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)); } } 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; } @@ -162,10 +168,6 @@ void StarZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoin void StarZone::do_seal() { -#if SIMGRID_HAVE_NS3 - xbt_assert(not dynamic_cast(get_network_model().get()), - "StarZone are not supported by NS-3 right now"); -#endif /* add default empty links if nothing was configured by user */ for (auto const& node : get_vertices()) { auto route = routes_.emplace(node->id(), StarRoute());