X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18080b8f80c81ed30600da55f774a52cbd1101f8..90d928f994ad7bc31969effd49b3b2ff501f1009:/src/kernel/routing/StarZone.cpp diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp index 489ecd9c88..aab5ccdb40 100644 --- a/src/kernel/routing/StarZone.cpp +++ b/src/kernel/routing/StarZone.cpp @@ -5,15 +5,13 @@ #include "simgrid/kernel/routing/StarZone.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/RoutedZone.hpp" #include "src/kernel/resource/NetworkModel.hpp" #include "xbt/string.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_star, ker_routing, "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, @@ -77,10 +75,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); } } @@ -170,16 +168,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)