-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2017. 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. */
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
- XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
- xbt_assert(!privateLinks_.empty(),
+ XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->cname(), src->id(), dst->cname(), dst->id());
+ xbt_assert(not privateLinks_.empty(),
"Cluster routing: no links attached to the source node - did you use host_link tag?");
if ((src->id() == dst->id()) && hasLoopback_) {
- xbt_assert(!src->isRouter(), "Routing from a cluster private router to itself is meaningless");
+ xbt_assert(not src->isRouter(), "Routing from a cluster private router to itself is meaningless");
- std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
route->link_list->push_back(info.first);
if (lat)
*lat += info.first->latency();
return;
}
- if (!src->isRouter()) { // No private link for the private router
+ if (not src->isRouter()) { // No private link for the private router
if (hasLimiter_) { // limiter for sender
- std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
+ privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
route->link_list->push_back(info.first);
}
- std::pair<Link*, Link*> info =
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0));
if (info.first) { // link up
route->link_list->push_back(info.first);
*lat += backbone_->latency();
}
- if (!dst->isRouter()) { // No specific link for router
+ if (not dst->isRouter()) { // No specific link for router
- std::pair<Link*, Link*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
+ privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
if (info.second) { // link down
route->link_list->push_back(info.second);
if (lat)
xbt_node_t backboneNode = nullptr;
if (backbone_) {
- backboneNode = new_xbt_graph_node(graph, backbone_->getName(), nodes);
+ backboneNode = new_xbt_graph_node(graph, backbone_->cname(), nodes);
new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
}
- for (auto src : vertices_) {
- if (!src->isRouter()) {
+ for (auto src : getVertices()) {
+ if (not src->isRouter()) {
xbt_node_t previous = new_xbt_graph_node(graph, src->cname(), nodes);
- std::pair<Link*, Link*> info = privateLinks_.at(src->id());
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
if (info.first) { // link up
- xbt_node_t current = new_xbt_graph_node(graph, info.first->getName(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.first->cname(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
}
if (info.second) { // link down
- xbt_node_t current = new_xbt_graph_node(graph, info.second->getName(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.second->cname(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
{
char* link_id = bprintf("%s_link_%d", cluster->id, id);
- s_sg_platf_link_cbarg_t link;
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
- Link *linkUp, *linkDown;
+ surf::LinkImpl *linkUp;
+ surf::LinkImpl *linkDown;
if (link.policy == SURF_LINK_FULLDUPLEX) {
char* tmp_link = bprintf("%s_UP", link_id);
- linkUp = Link::byName(tmp_link);
+ linkUp = surf::LinkImpl::byName(tmp_link);
xbt_free(tmp_link);
tmp_link = bprintf("%s_DOWN", link_id);
- linkDown = Link::byName(tmp_link);
+ linkDown = surf::LinkImpl::byName(tmp_link);
xbt_free(tmp_link);
} else {
- linkUp = Link::byName(link_id);
+ linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;
}
- privateLinks_.insert({position, {linkUp, linkDown}});
xbt_free(link_id);
+ privateLinks_.insert({position, {linkUp, linkDown}});
}
}
}