-/* Copyright (c) 2009-2018. 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
/* This routing is specifically setup to represent clusters, aka homogeneous sets of machines
- * Note that a router is created, easing the interconnexion with the rest of the world. */
+ * Note that a router is created, easing the interconnection with the rest of the world. */
namespace simgrid {
namespace kernel {
namespace routing {
-ClusterZone::ClusterZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+ClusterZone::ClusterZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
: NetZoneImpl(father, name, netmodel)
{
}
"Cluster routing: no links attached to the source node - did you use host_link tag?");
if ((src->id() == dst->id()) && has_loopback_) {
- xbt_assert(not src->is_router(), "Routing from a cluster private router to itself is meaningless");
-
- std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
- route->link_list.push_back(info.first);
- if (lat)
- *lat += info.first->get_latency();
+ if (src->is_router()) {
+ XBT_WARN("Routing from a cluster private router to itself is meaningless");
+ } else {
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
+ route->link_list.push_back(info.first);
+ if (lat)
+ *lat += info.first->get_latency();
+ }
return;
}
}
if (not dst->is_router()) { // No specific link for router
-
std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
private_links_.at(node_pos_with_loopback_limiter(dst->id()));
+
if (info.second) { // link down
route->link_list.push_back(info.second);
if (lat)
}
}
-void ClusterZone::get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
- std::map<std::string, xbt_edge_t>* edges)
+void ClusterZone::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
+ std::map<std::string, xbt_edge_t, std::less<>>* edges)
{
xbt_assert(router_,
"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
LinkCreationArgs link;
link.id = link_id;
- link.bandwidth = cluster->bw;
+ link.bandwidths.push_back(cluster->bw);
link.latency = cluster->lat;
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
- s4u::Link* linkUp;
- s4u::Link* linkDown;
+ const s4u::Link* linkUp;
+ const s4u::Link* linkDown;
if (link.policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
linkUp = s4u::Link::by_name(link_id + "_UP");
linkDown = s4u::Link::by_name(link_id + "_DOWN");