X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6bb41d92e3329c3be26c100026424ed3885d8554..47ba551ee792c3cc4a5960dfb0dc9c42d08509d3:/src/kernel/routing/ClusterZone.cpp diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp index 14c3fb05ef..df83652863 100644 --- a/src/kernel/routing/ClusterZone.cpp +++ b/src/kernel/routing/ClusterZone.cpp @@ -5,7 +5,6 @@ #include "simgrid/kernel/routing/ClusterZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/RoutedZone.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_cluster, ker_routing, "Kernel Cluster Routing"); @@ -57,58 +56,6 @@ NetPoint* ClusterBase::get_gateway(unsigned long position) return it == gateways_.end() ? nullptr : it->second; } -void ClusterBase::get_graph(const s_xbt_graph_t* graph, std::map>* nodes, - std::map>* edges) -{ - std::vector vertices = get_vertices(); - - for (auto const& my_src : vertices) { - for (auto const& my_dst : vertices) { - if (my_src == my_dst) - continue; - - Route route; - - get_local_route(my_src, my_dst, &route, nullptr); - - XBT_DEBUG("get_route_and_latency %s -> %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; - - 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_) { - const char* link_name = link->get_cname(); - current = new_xbt_graph_node(graph, link_name, nodes); - current_name = link_name; - new_xbt_graph_edge(graph, previous, current, edges); - XBT_DEBUG(" %s -> %s", previous_name, current_name); - previous = current; - previous_name = current_name; - } - - 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); - } - } -} - void ClusterBase::fill_leaf_from_cb(unsigned long position, const std::vector& dimensions, const s4u::ClusterCallbacks& set_callbacks, NetPoint** node_netpoint, s4u::Link** lb_link, s4u::Link** limiter_link)