X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f21f35eadfc5d1f43d3e7a4b591711fd7fb9616..900a1b123739221101cc09eb8c65f6d90792c2bb:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index 226d0f109f..31741214ad 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -4,24 +4,20 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/routing/TorusZone.hpp" -#include "src/kernel/routing/NetCard.hpp" - +#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf"); -inline unsigned int* rankId_to_coords(int rankId, xbt_dynar_t dimensions) +inline void rankId_to_coords(int rankId, std::vector dimensions, unsigned int (*coords)[4]) { - - unsigned int i = 0, cur_dim_size = 1, dim_size_product = 1; - unsigned int* coords = (unsigned int*)malloc(xbt_dynar_length(dimensions) * sizeof(unsigned int)); - for (i = 0; i < xbt_dynar_length(dimensions); i++) { - cur_dim_size = xbt_dynar_get_as(dimensions, i, int); - coords[i] = (rankId / dim_size_product) % cur_dim_size; + unsigned int dim_size_product = 1; + unsigned int i = 0; + for (auto cur_dim_size: dimensions) { + (*coords)[i] = (rankId / dim_size_product) % cur_dim_size; dim_size_product *= cur_dim_size; + i++; } - - return coords; } namespace simgrid { @@ -30,10 +26,6 @@ namespace routing { TorusZone::TorusZone(NetZone* father, const char* name) : ClusterZone(father, name) { } -TorusZone::~TorusZone() -{ - xbt_dynar_free(&dimensions_); -} void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) { @@ -42,16 +34,15 @@ void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, * Each rank creates @a dimensions-1 links */ int neighbor_rank_id = 0; // The other node the link connects - int current_dimension = 0, // which dimension are we currently in? + int current_dimension = 0; // which dimension are we currently in? // we need to iterate over all dimensions // and create all links there - dim_product = 1; // Needed to calculate the next neighbor_id - for (unsigned int j = 0; j < xbt_dynar_length(dimensions_); j++) { + int dim_product = 1; // Needed to calculate the next neighbor_id + for (unsigned int j = 0; j < dimensions_.size(); j++) { - s_sg_platf_link_cbarg_t link; - memset(&link, 0, sizeof(link)); - current_dimension = xbt_dynar_get_as(dimensions_, j, int); - neighbor_rank_id = (((int)rank / dim_product) % current_dimension == current_dimension - 1) + LinkCreationArgs link; + current_dimension = dimensions_.at(j); + neighbor_rank_id = ((static_cast(rank) / dim_product) % current_dimension == current_dimension - 1) ? rank - (current_dimension - 1) * dim_product : rank + dim_product; // name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case) @@ -61,17 +52,17 @@ void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, link.latency = cluster->lat; link.policy = cluster->sharing_policy; sg_platf_new_link(&link); - Link* linkUp; - Link* 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); free(tmp_link); tmp_link = bprintf("%s_DOWN", link_id); - linkDown = Link::byName(tmp_link); + linkDown = surf::LinkImpl::byName(tmp_link); free(tmp_link); } else { - linkUp = Link::byName(link_id); + linkUp = surf::LinkImpl::byName(link_id); linkDown = linkUp; } /* @@ -94,23 +85,20 @@ void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ","); if (!xbt_dynar_is_empty(dimensions)) { - dimensions_ = xbt_dynar_new(sizeof(int), nullptr); /* We are in a torus cluster - * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" - * and safe it in a dynarray. + * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and safe it in a vector. * Additionally, we need to know how many ranks we have in total */ xbt_dynar_foreach (dimensions, iter, groups) { - int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char*)); - xbt_dynar_set_as(dimensions_, iter, int, tmp); + dimensions_.push_back(surf_parse_get_int(groups)); } - linkCountPerNode_ = xbt_dynar_length(dimensions_); + linkCountPerNode_ = dimensions_.size(); } xbt_dynar_free(&dimensions); } -void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) +void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) { XBT_VERB("torus getLocalRoute from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(), @@ -120,7 +108,7 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t return; if (src->id() == dst->id() && hasLoopback_) { - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); + std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); route->link_list->push_back(info.first); if (lat) @@ -132,7 +120,7 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t * Dimension based routing routes through each dimension consecutively * TODO Change to dynamic assignment */ - unsigned int j, cur_dim, dim_product = 1; + unsigned int dim_product = 1; unsigned int current_node = src->id(); unsigned int next_node = 0; /* @@ -141,8 +129,10 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t * both arrays, we can easily assess whether we need to route * into this dimension or not. */ - unsigned int* myCoords = rankId_to_coords(src->id(), dimensions_); - unsigned int* targetCoords = rankId_to_coords(dst->id(), dimensions_); + unsigned int myCoords[4]; + rankId_to_coords(src->id(), dimensions_, &myCoords); + unsigned int targetCoords[4]; + rankId_to_coords(dst->id(), dimensions_, &targetCoords); /* * linkOffset describes the offset where the link * we want to use is stored @@ -150,16 +140,15 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t * which can only be the case if src->m_id == dst->m_id -- see above * for this special case) */ - int nodeOffset = (xbt_dynar_length(dimensions_) + 1) * src->id(); + int nodeOffset = (dimensions_.size() + 1) * src->id(); int linkOffset = nodeOffset; bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"? // false means: next -> cur while (current_node != dst->id()) { dim_product = 1; // First, we will route in x-dimension - for (j = 0; j < xbt_dynar_length(dimensions_); j++) { - cur_dim = xbt_dynar_get_as(dimensions_, j, int); - + int j=0; + for (auto cur_dim : dimensions_){ // current_node/dim_product = position in current dimension if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) { @@ -193,14 +182,14 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t } XBT_DEBUG("torus_get_route_and_latency - current_node: %i, next_node: %u, linkOffset is %i", current_node, next_node, linkOffset); - break; } + j++; dim_product *= cur_dim; } - std::pair info; + std::pair info; if (hasLimiter_) { // limiter for sender info = privateLinks_.at(nodeOffset + hasLoopback_); @@ -221,8 +210,6 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t current_node = next_node; next_node = 0; } - free(myCoords); - free(targetCoords); } } }