X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/579d27969fbc1fa8004de922816a0068e52a9fa6..1957cbeaedc9d28cea7839684d82ac8454cc8bef:/src/kernel/routing/ClusterZone.cpp diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp index d2eb784757..2bd66e5359 100644 --- a/src/kernel/routing/ClusterZone.cpp +++ b/src/kernel/routing/ClusterZone.cpp @@ -1,10 +1,10 @@ -/* 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. */ #include "src/kernel/routing/ClusterZone.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/kernel/routing/RoutedZone.hpp" #include "src/surf/network_interface.hpp" @@ -16,34 +16,33 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf" namespace simgrid { namespace kernel { namespace routing { -ClusterZone::ClusterZone(NetZone* father, const char* name) : NetZoneImpl(father, name) +ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father, name) { } -void ClusterZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) +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 info = privateLinks_.at(src->id() * linkCountPerNode_); + std::pair info = privateLinks_.at(nodePosition(src->id())); 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 info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0)); + std::pair info = privateLinks_.at(nodePositionWithLoopback(src->id())); route->link_list->push_back(info.first); } - std::pair info = - privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0)); + std::pair info = privateLinks_.at(nodePositionWithLimiter(src->id())); if (info.first) { // link up route->link_list->push_back(info.first); if (lat) @@ -57,16 +56,16 @@ void ClusterZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg *lat += backbone_->latency(); } - if (!dst->isRouter()) { // No specific link for router + if (not dst->isRouter()) { // No specific link for router - std::pair info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_); + std::pair info = privateLinks_.at(nodePositionWithLimiter(dst->id())); if (info.second) { // link down route->link_list->push_back(info.second); if (lat) *lat += info.second->latency(); } if (hasLimiter_) { // limiter for receiver - info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); + info = privateLinks_.at(nodePositionWithLoopback(dst->id())); route->link_list->push_back(info.first); } } @@ -82,18 +81,18 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges 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 const& src : getVertices()) { + if (not src->isRouter()) { xbt_node_t previous = new_xbt_graph_node(graph, src->cname(), nodes); - std::pair info = privateLinks_.at(src->id()); + std::pair 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_) { @@ -104,7 +103,7 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges } 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_) { @@ -117,32 +116,27 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges } } -void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int /*rank*/, int position) +void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int /*rank*/, int position) { - char* link_id = bprintf("%s_link_%d", cluster->id, id); + std::string link_id = cluster->id + "_link_" + std::to_string(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); - xbt_free(tmp_link); - tmp_link = bprintf("%s_DOWN", link_id); - linkDown = Link::byName(tmp_link); - xbt_free(tmp_link); + linkUp = surf::LinkImpl::byName(link_id + "_UP"); + linkDown = surf::LinkImpl::byName(link_id + "_DOWN"); } else { - linkUp = Link::byName(link_id); + linkUp = surf::LinkImpl::byName(link_id); linkDown = linkUp; } privateLinks_.insert({position, {linkUp, linkDown}}); - xbt_free(link_id); } } }