X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcfc0ea5eb247b371f85af9dd1e730d93f5c7f38..0c07b616d38841a028f8a34fe66394e232008b5e:/src/kernel/routing/AsCluster.cpp?ds=sidebyside diff --git a/src/kernel/routing/AsCluster.cpp b/src/kernel/routing/AsCluster.cpp index fd5f54064e..548ef8129d 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,51 +53,45 @@ 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) { - xbt_node_t current, previous, backboneNode = nullptr, routerNode; - s_surf_parsing_link_up_down_t 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); + xbt_node_t backboneNode = nullptr; if(backbone_) { - const char *link_nameR = backbone_->getName(); - backboneNode = new_xbt_graph_node(graph, link_nameR, nodes); - + backboneNode = new_xbt_graph_node(graph, backbone_->getName(), nodes); new_xbt_graph_edge(graph, routerNode, backboneNode, edges); } for (auto src: vertices_){ if (! src->isRouter()) { - previous = new_xbt_graph_node(graph, src->name(), nodes); + xbt_node_t previous = new_xbt_graph_node(graph, src->cname(), nodes); - info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t); + std::pair info = privateLinks_.at(src->id()); - if (info.linkUp) { // link up - const char *link_name = static_cast(info.linkUp)->getName(); - current = new_xbt_graph_node(graph, link_name, nodes); + if (info.first) { // link up + xbt_node_t current = new_xbt_graph_node(graph, info.first->getName(), nodes); new_xbt_graph_edge(graph, previous, current, edges); if (backbone_) { @@ -110,10 +101,8 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } } - if (info.linkDown) { // link down - const char *link_name = static_cast( - info.linkDown)->getName(); - current = new_xbt_graph_node(graph, link_name, nodes); + if (info.second) { // link down + xbt_node_t current = new_xbt_graph_node(graph, info.second->getName(), nodes); new_xbt_graph_edge(graph, previous, current, edges); if (backbone_) { @@ -127,7 +116,6 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int , int position){ - s_surf_parsing_link_up_down_t info; char* link_id = bprintf("%s_link_%d", cluster->id, id); s_sg_platf_link_cbarg_t link; @@ -138,18 +126,19 @@ void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, link.policy = cluster->sharing_policy; sg_platf_new_link(&link); + Link *linkUp, *linkDown; if (link.policy == SURF_LINK_FULLDUPLEX) { char *tmp_link = bprintf("%s_UP", link_id); - info.linkUp = Link::byName(tmp_link); + linkUp = Link::byName(tmp_link); xbt_free(tmp_link); tmp_link = bprintf("%s_DOWN", link_id); - info.linkDown = Link::byName(tmp_link); + linkDown = Link::byName(tmp_link); xbt_free(tmp_link); } else { - info.linkUp = Link::byName(link_id); - info.linkDown = info.linkUp; + linkUp = Link::byName(link_id); + linkDown = linkUp; } - xbt_dynar_set(privateLinks_, position, &info); + privateLinks_.insert({position, {linkUp, linkDown}}); xbt_free(link_id); }