-/* 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<resource::LinkImpl*>& links, Route* route, double* latency,
- std::unordered_set<resource::LinkImpl*>& added_links) const
+void StarZone::add_links_to_route(const std::vector<resource::StandardLinkImpl*>& links, Route* route, double* latency,
+ std::unordered_set<resource::StandardLinkImpl*>& added_links) const
{
for (auto* link : links) {
/* do not add duplicated links in route->link_list_ */
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<resource::LinkImpl*> added_links;
+ std::unordered_set<resource::StandardLinkImpl*> added_links;
/* loopback */
if (src == dst && src_route.has_loopback()) {
add_links_to_route(src_route.loopback, route, latency, added_links);
xbt_node_t star_node = new_xbt_graph_node(graph, get_cname(), nodes);
for (auto const& src : get_vertices()) {
+ const char* src_name = routes_[src->id()].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);
previous = star_node;
for (auto const* link : routes_[src->id()].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);
}
}
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));
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));
{
/* 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)