-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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. */
namespace simgrid {
namespace kernel {
namespace routing {
-ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father, name)
+ClusterZone::ClusterZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
+ : NetZoneImpl(father, name, netmodel)
{
}
-void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
xbt_assert(not private_links_.empty(),
"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<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePosition(src->id()));
- route->link_list.push_back(info.first);
- if (lat)
- *lat += info.first->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 src->is_router()) { // No private link for the private router
if (has_limiter_) { // limiter for sender
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLoopback(src->id()));
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(src->id()));
route->link_list.push_back(info.first);
}
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(src->id()));
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
+ private_links_.at(node_pos_with_loopback_limiter(src->id()));
if (info.first) { // link up
route->link_list.push_back(info.first);
if (lat)
- *lat += info.first->latency();
+ *lat += info.first->get_latency();
}
}
if (backbone_) {
route->link_list.push_back(backbone_);
if (lat)
- *lat += backbone_->latency();
+ *lat += backbone_->get_latency();
}
if (not dst->is_router()) { // No specific link for router
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(dst->id()));
+ 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)
- *lat += info.second->latency();
+ *lat += info.second->get_latency();
}
if (has_limiter_) { // limiter for receiver
- info = private_links_.at(nodePositionWithLoopback(dst->id()));
+ info = private_links_.at(node_pos_with_loopback(dst->id()));
route->link_list.push_back(info.first);
}
}
new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
}
- for (auto const& src : getVertices()) {
+ for (auto const& src : get_vertices()) {
if (not src->is_router()) {
xbt_node_t previous = new_xbt_graph_node(graph, src->get_cname(), nodes);
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(src->id());
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(src->id());
if (info.first) { // link up
xbt_node_t current = new_xbt_graph_node(graph, info.first->get_cname(), nodes);
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
- surf::LinkImpl *linkUp;
- surf::LinkImpl *linkDown;
- if (link.policy == SURF_LINK_SPLITDUPLEX) {
- linkUp = surf::LinkImpl::byName(link_id + "_UP");
- linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
+ s4u::Link* linkUp;
+ 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");
} else {
- linkUp = surf::LinkImpl::byName(link_id);
+ linkUp = s4u::Link::by_name(link_id);
linkDown = linkUp;
}
- private_links_.insert({position, {linkUp, linkDown}});
+ private_links_.insert({position, {linkUp->get_impl(), linkDown->get_impl()}});
}
}
}