X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d785a64b1830b6a5d05561316ef7161ee1c67671..76cc94266507b7f7e29f95d3c65e2370cbd40142:/src/kernel/routing/AsCluster.cpp diff --git a/src/kernel/routing/AsCluster.cpp b/src/kernel/routing/AsCluster.cpp index e85becf24c..95805fc2f8 100644 --- a/src/kernel/routing/AsCluster.cpp +++ b/src/kernel/routing/AsCluster.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); @@ -14,41 +15,37 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf" namespace simgrid { namespace kernel { namespace routing { - AsCluster::AsCluster(const char*name) - : AsImpl(name) - {} - AsCluster::~AsCluster() - { - xbt_dynar_free(&privateLinks_); - } +AsCluster::AsCluster(As* father, const char* name) : AsImpl(father, name) +{ +} -void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) +void AsCluster::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) { - s_surf_parsing_link_up_down_t info; - XBT_VERB("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]", - src->name(), src->id(), dst->name(), dst->id()); - xbt_assert(!xbt_dynar_is_empty(privateLinks_), "Cluster routing : no links attached to the source node - did you use host_link tag?"); + XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id()); + xbt_assert(!privateLinks_.empty(), + "Cluster routing: no links attached to the source node - did you use host_link tag?"); + if (! src->isRouter()) { // No specific link for router if((src->id() == dst->id()) && hasLoopback_ ){ - info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_, s_surf_parsing_link_up_down_t); - route->link_list->push_back(info.linkUp); + std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); + route->link_list->push_back(info.first); if (lat) - *lat += info.linkUp->getLatency(); + *lat += info.first->latency(); return; } - if (hasLimiter_){ // limiter for sender - info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_ + (hasLoopback_?1:0), s_surf_parsing_link_up_down_t); - route->link_list->push_back((Link*)info.linkUp); + std::pair info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0)); + route->link_list->push_back(info.first); } - info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_ + (hasLoopback_?1:0) + (hasLimiter_?1:0), s_surf_parsing_link_up_down_t); - if (info.linkUp) { // link up - route->link_list->push_back(info.linkUp); + std::pair info = + privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0)); + if (info.first) { // link up + route->link_list->push_back(info.first); if (lat) - *lat += info.linkUp->getLatency(); + *lat += info.first->latency(); } } @@ -56,38 +53,33 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb if (backbone_) { route->link_list->push_back(backbone_); if (lat) - *lat += backbone_->getLatency(); + *lat += backbone_->latency(); } if (! dst->isRouter()) { // No specific link for router - info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_, s_surf_parsing_link_up_down_t); + std::pair info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_); - if (info.linkDown) { // link down - route->link_list->push_back(info.linkDown); + if (info.second) { // link down + route->link_list->push_back(info.second); if (lat) - *lat += info.linkDown->getLatency(); + *lat += info.second->latency(); } if (hasLimiter_){ // limiter for receiver - info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_, s_surf_parsing_link_up_down_t); - route->link_list->push_back(info.linkUp); + info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); + route->link_list->push_back(info.first); } } } void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) { - int isrc; - int table_size = xbt_dynar_length(vertices_); - - NetCard *src; - xbt_node_t current, previous, backboneNode = nullptr, routerNode; - s_surf_parsing_link_up_down_t info; + xbt_node_t current, previous, backboneNode = nullptr; + std::pair info; xbt_assert(router_,"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph."); /* create the router */ - char *link_name = router_->name(); - routerNode = new_xbt_graph_node(graph, link_name, nodes); + xbt_node_t routerNode = new_xbt_graph_node(graph, router_->cname(), nodes); if(backbone_) { const char *link_nameR = backbone_->getName(); @@ -96,18 +88,14 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) new_xbt_graph_edge(graph, routerNode, backboneNode, edges); } - for (isrc = 0; isrc < table_size; isrc++) { - src = xbt_dynar_get_as(vertices_, isrc, NetCard*); - + for (auto src: vertices_){ if (! src->isRouter()) { - previous = new_xbt_graph_node(graph, src->name(), nodes); + previous = new_xbt_graph_node(graph, src->cname(), nodes); - info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t); + info = privateLinks_.at(src->id()); - if (info.linkUp) { // link up - - const char *link_name = static_cast( - info.linkUp)->getName(); + if (info.first) { // link up + const char* link_name = static_cast(info.first)->getName(); current = new_xbt_graph_node(graph, link_name, nodes); new_xbt_graph_edge(graph, previous, current, edges); @@ -116,12 +104,10 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } else { new_xbt_graph_edge(graph, current, routerNode, edges); } - } - if (info.linkDown) { // link down - const char *link_name = static_cast( - info.linkDown)->getName(); + if (info.second) { // link down + const char* link_name = static_cast(info.second)->getName(); current = new_xbt_graph_node(graph, link_name, nodes); new_xbt_graph_edge(graph, previous, current, edges); @@ -132,7 +118,6 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } } } - } } @@ -159,7 +144,7 @@ void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, info.linkUp = Link::byName(link_id); info.linkDown = info.linkUp; } - xbt_dynar_set(privateLinks_, position, &info); + privateLinks_.insert({position, {info.linkUp, info.linkDown}}); xbt_free(link_id); }