X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f90173083cea6c05e9a2418bc11c47750d006d8..76d4849864c227687e17bdd93c5b1338e9b4cb50:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index b6b01f6ea5..308c81e52a 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -1,23 +1,23 @@ -/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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. */ +#include "simgrid/kernel/routing/RoutedZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" #include "xbt/dict.h" #include "xbt/graph.h" #include "xbt/log.h" #include "xbt/sysdep.h" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/RoutedZone.hpp" -#include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); /* ***************************************************************** */ /* *********************** GENERIC METHODS ************************* */ -xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, std::map* nodes) +xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, + std::map>* nodes) { auto elm = nodes->find(name); if (elm == nodes->end()) { @@ -29,10 +29,10 @@ xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, std: } xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t s, xbt_node_t d, - std::map* edges) + std::map>* edges) { - const char* sn = static_cast(xbt_graph_node_get_data(s)); - const char* dn = static_cast(xbt_graph_node_get_data(d)); + const auto* sn = static_cast(xbt_graph_node_get_data(s)); + const auto* dn = static_cast(xbt_graph_node_get_data(d)); std::string name = std::string(sn) + dn; auto elm = edges->find(name); @@ -53,13 +53,10 @@ namespace simgrid { namespace kernel { namespace routing { -RoutedZone::RoutedZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) - : NetZoneImpl(father, name, netmodel) -{ -} +RoutedZone::RoutedZone(const std::string& name) : NetZoneImpl(name) {} -void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::map* nodes, - std::map* edges) +void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::map>* nodes, + std::map>* edges) { std::vector vertices = get_vertices(); @@ -68,26 +65,26 @@ void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::map %s", my_src->get_cname(), my_dst->get_cname()); xbt_node_t current; xbt_node_t previous; - const char *previous_name; - const char *current_name; + const char* previous_name; + const char* current_name; - if (route->gw_src) { - previous = new_xbt_graph_node(graph, route->gw_src->get_cname(), nodes); - previous_name = route->gw_src->get_cname(); + if (route.gw_src_) { + previous = new_xbt_graph_node(graph, route.gw_src_->get_cname(), nodes); + previous_name = route.gw_src_->get_cname(); } else { previous = new_xbt_graph_node(graph, my_src->get_cname(), nodes); previous_name = my_src->get_cname(); } - for (auto const& link : route->link_list) { + for (auto const& link : route.link_list_) { const char* link_name = link->get_cname(); current = new_xbt_graph_node(graph, link_name, nodes); current_name = link_name; @@ -97,17 +94,15 @@ void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::mapgw_dst) { - current = new_xbt_graph_node(graph, route->gw_dst->get_cname(), nodes); - current_name = route->gw_dst->get_cname(); + if (route.gw_dst_) { + current = new_xbt_graph_node(graph, route.gw_dst_->get_cname(), nodes); + current_name = route.gw_dst_->get_cname(); } else { current = new_xbt_graph_node(graph, my_dst->get_cname(), nodes); current_name = my_dst->get_cname(); } new_xbt_graph_edge(graph, previous, current, edges); XBT_DEBUG(" %s -> %s", previous_name, current_name); - - delete route; } } } @@ -115,35 +110,28 @@ void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::map& link_list, bool /* symmetrical */, - bool change_order) +Route* RoutedZone::new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst, + const std::vector& link_list, bool preserve_order) { - RouteCreationArgs* result = new RouteCreationArgs(); - - xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive, - "The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here."); + auto* result = new Route(); if (hierarchy == RoutingMode::recursive) { xbt_assert(gw_src && gw_dst, "nullptr is obviously a deficient gateway"); - result->gw_src = gw_src; - result->gw_dst = gw_dst; + result->gw_src_ = gw_src; + result->gw_dst_ = gw_dst; } - for (auto const& link : link_list) { - if (change_order) - result->link_list.push_back(link); - else - result->link_list.insert(result->link_list.begin(), link); - } - result->link_list.shrink_to_fit(); + if (preserve_order) + result->link_list_ = link_list; + else + result->link_list_.assign(link_list.rbegin(), link_list.rend()); // reversed + result->link_list_.shrink_to_fit(); return result; } -void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) const +void RoutedZone::get_route_check_params(const NetPoint* src, const NetPoint* dst) const { xbt_assert(src, "Cannot find a route from nullptr to %s", dst->get_cname()); xbt_assert(dst, "Cannot find a route from %s to nullptr", src->get_cname()); @@ -161,7 +149,7 @@ void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) const src->get_cname(), dst->get_cname(), src_as->get_cname(), dst_as->get_cname(), get_cname()); } void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical) const + const std::vector& link_list, bool symmetrical) const { const char* srcName = src->get_cname(); const char* dstName = dst->get_cname(); @@ -172,11 +160,13 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName); xbt_assert(not link_list.empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName); xbt_assert(not src->is_netzone(), - "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", + "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have a NetzoneRoute?", srcName); xbt_assert(not dst->is_netzone(), - "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", + "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have a NetzoneRoute?", dstName); + s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, get_link_list_impl(link_list, false)); + NetZoneImpl::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, get_link_list_impl(link_list, false)); } else { XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, gw_src->get_cname(), dstName, gw_dst->get_cname()); xbt_assert(src->is_netzone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName); @@ -187,7 +177,7 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* xbt_assert(gw_dst->is_host() || gw_dst->is_router(), "When defining a NetzoneRoute, gw_dst must be a host or a router but '%s' is not.", dstName); - xbt_assert(gw_src != gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", gw_src->get_cname()); + xbt_assert(gw_src != gw_dst, "Cannot define a NetzoneRoute from '%s' to itself", gw_src->get_cname()); xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, gw_src->get_cname(), dstName, gw_dst->get_cname(), srcName); @@ -195,9 +185,20 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_dst->get_cname(), dstName); xbt_assert(not link_list.empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName, gw_src->get_cname(), dstName, gw_dst->get_cname()); + const auto* netzone_src = get_netzone_recursive(src); + xbt_assert(netzone_src->is_component_recursive(gw_src), + "Invalid NetzoneRoute from %s@%s to %s@%s: gw_src %s belongs to %s, not to %s.", srcName, + gw_src->get_cname(), dstName, gw_dst->get_cname(), gw_src->get_cname(), + gw_src->get_englobing_zone()->get_cname(), srcName); + + const auto* netzone_dst = get_netzone_recursive(dst); + xbt_assert(netzone_dst->is_component_recursive(gw_dst), + "Invalid NetzoneRoute from %s@%s to %s@%s: gw_dst %s belongs to %s, not to %s.", srcName, + gw_src->get_cname(), dstName, gw_dst->get_cname(), gw_dst->get_cname(), + gw_dst->get_englobing_zone()->get_cname(), dst->get_cname()); + s4u::NetZone::on_route_creation(symmetrical, gw_src, gw_dst, gw_src, gw_dst, get_link_list_impl(link_list, false)); + NetZoneImpl::on_route_creation(symmetrical, gw_src, gw_dst, gw_src, gw_dst, get_link_list_impl(link_list, false)); } - - s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list); } } // namespace routing } // namespace kernel