X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7344bf4cd4b75fe33e19f2ac1994b200962aa7e..b67343d6e9fc74fc159a51a48d0ea7d9a2374712:/src/kernel/routing/ClusterZone.cpp diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp index 1a191c8b6a..021eddd65b 100644 --- a/src/kernel/routing/ClusterZone.cpp +++ b/src/kernel/routing/ClusterZone.cpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2009-2016. 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. */ -#include "src/kernel/routing/ClusterZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/RoutedZone.hpp" +#include "simgrid/kernel/routing/ClusterZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/RoutedZone.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" // FIXME: RouteCreationArgs and friends XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); @@ -16,86 +17,87 @@ 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(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : NetZoneImpl(father, name, netmodel) { } -void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { - XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id()); - xbt_assert(not privateLinks_.empty(), + 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()) && hasLoopback_) { - xbt_assert(not src->isRouter(), "Routing from a cluster private router to itself is meaningless"); + 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 info = privateLinks_.at(src->id() * linkCountPerNode_); - route->link_list->push_back(info.first); + std::pair info = private_links_.at(node_pos(src->id())); + route->link_list.push_back(info.first); if (lat) - *lat += info.first->latency(); + *lat += info.first->get_latency(); return; } - 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)); - route->link_list->push_back(info.first); + if (not src->is_router()) { // No private link for the private router + if (has_limiter_) { // limiter for sender + std::pair info = private_links_.at(node_pos_with_loopback(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 = + private_links_.at(node_pos_with_loopback_limiter(src->id())); if (info.first) { // link up - route->link_list->push_back(info.first); + 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_); + route->link_list.push_back(backbone_); if (lat) - *lat += backbone_->latency(); + *lat += backbone_->get_latency(); } - if (not dst->isRouter()) { // No specific link for router + if (not dst->is_router()) { // No specific link for router - std::pair info = - privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_); + std::pair info = + private_links_.at(node_pos_with_loopback_limiter(dst->id())); if (info.second) { // link down - route->link_list->push_back(info.second); + route->link_list.push_back(info.second); if (lat) - *lat += info.second->latency(); + *lat += info.second->get_latency(); } - if (hasLimiter_) { // limiter for receiver - info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); - route->link_list->push_back(info.first); + if (has_limiter_) { // limiter for receiver + info = private_links_.at(node_pos_with_loopback(dst->id())); + route->link_list.push_back(info.first); } } } -void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) +void ClusterZone::get_graph(xbt_graph_t graph, std::map* nodes, + std::map* edges) { xbt_assert(router_, "Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph."); /* create the router */ - xbt_node_t routerNode = new_xbt_graph_node(graph, router_->cname(), nodes); + xbt_node_t routerNode = new_xbt_graph_node(graph, router_->get_cname(), nodes); xbt_node_t backboneNode = nullptr; if (backbone_) { - backboneNode = new_xbt_graph_node(graph, backbone_->cname(), nodes); + backboneNode = new_xbt_graph_node(graph, backbone_->get_cname(), nodes); new_xbt_graph_edge(graph, routerNode, backboneNode, edges); } - for (auto src : getVertices()) { - if (not src->isRouter()) { - xbt_node_t previous = new_xbt_graph_node(graph, src->cname(), nodes); + 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 info = privateLinks_.at(src->id()); + std::pair info = private_links_.at(src->id()); if (info.first) { // link up - xbt_node_t current = new_xbt_graph_node(graph, info.first->cname(), nodes); + xbt_node_t current = new_xbt_graph_node(graph, info.first->get_cname(), nodes); new_xbt_graph_edge(graph, previous, current, edges); if (backbone_) { @@ -106,7 +108,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->cname(), nodes); + xbt_node_t current = new_xbt_graph_node(graph, info.second->get_cname(), nodes); new_xbt_graph_edge(graph, previous, current, edges); if (backbone_) { @@ -119,9 +121,9 @@ 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*/, unsigned int position) { - char* link_id = bprintf("%s_link_%d", cluster->id, id); + std::string link_id = cluster->id + "_link_" + std::to_string(id); LinkCreationArgs link; link.id = link_id; @@ -130,21 +132,16 @@ void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id link.policy = cluster->sharing_policy; sg_platf_new_link(&link); - surf::LinkImpl *linkUp; - surf::LinkImpl *linkDown; - if (link.policy == SURF_LINK_FULLDUPLEX) { - char* tmp_link = bprintf("%s_UP", link_id); - linkUp = surf::LinkImpl::byName(tmp_link); - xbt_free(tmp_link); - tmp_link = bprintf("%s_DOWN", link_id); - linkDown = surf::LinkImpl::byName(tmp_link); - xbt_free(tmp_link); + 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; } - xbt_free(link_id); - privateLinks_.insert({position, {linkUp, linkDown}}); + private_links_.insert({position, {linkUp->get_impl(), linkDown->get_impl()}}); } } }