X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..e16e0233:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index 4992637081..971fd4c5e4 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -1,11 +1,13 @@ -/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-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/TorusZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/TorusZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" + #include #include #include @@ -13,33 +15,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf"); -inline void rankId_to_coords(int rankId, std::vector dimensions, unsigned int (*coords)[4]) -{ - unsigned int dim_size_product = 1; - unsigned int i = 0; - for (auto const& cur_dim_size : dimensions) { - (*coords)[i] = (rankId / dim_size_product) % cur_dim_size; - dim_size_product *= cur_dim_size; - i++; - } -} - namespace simgrid { namespace kernel { namespace routing { -TorusZone::TorusZone(NetZone* father, std::string name) : ClusterZone(father, name) +TorusZone::TorusZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : ClusterZone(father, name, netmodel) { } -void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, int position) +void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position) { /* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */ int dim_product = 1; // Needed to calculate the next neighbor_id for (unsigned int j = 0; j < dimensions_.size(); j++) { LinkCreationArgs link; - int current_dimension = dimensions_.at(j); // which dimension are we currently in? - // we need to iterate over all dimensions and create all links there + int current_dimension = dimensions_[j]; // which dimension are we currently in? + // we need to iterate over all dimensions and create all links there // The other node the link connects int neighbor_rank_id = ((static_cast(rank) / dim_product) % current_dimension == current_dimension - 1) ? rank - (current_dimension - 1) * dim_product @@ -48,19 +40,17 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int std::string link_id = std::string(cluster->id) + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id); link.id = link_id; - link.bandwidth = cluster->bw; + link.bandwidths.push_back(cluster->bw); link.latency = cluster->lat; link.policy = cluster->sharing_policy; sg_platf_new_link(&link); - surf::LinkImpl* linkUp; - surf::LinkImpl* linkDown; - if (link.policy == SURF_LINK_FULLDUPLEX) { - std::string tmp_link = link_id + "_UP"; - linkUp = surf::LinkImpl::byName(tmp_link); - tmp_link = link_id + "_DOWN"; - linkDown = surf::LinkImpl::byName(tmp_link); + resource::LinkImpl* linkUp; + resource::LinkImpl* linkDown; + if (link.policy == s4u::Link::SharingPolicy::SPLITDUPLEX) { + linkUp = s4u::Link::by_name(link_id + "_UP")->get_impl(); + linkDown = s4u::Link::by_name(link_id + "_DOWN")->get_impl(); } else { - linkUp = surf::LinkImpl::byName(link_id); + linkUp = s4u::Link::by_name(link_id)->get_impl(); linkDown = linkUp; } /* @@ -68,7 +58,7 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int * Note that position rankId*(xbt_dynar_length(dimensions)+has_loopback?+has_limiter?) * holds the link "rankId->rankId" */ - privateLinks_.insert({position + j, {linkUp, linkDown}}); + private_links_.insert({position + j, {linkUp, linkDown}}); dim_product *= current_dimension; } rank++; @@ -87,24 +77,24 @@ void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster) for (auto const& group : dimensions) dimensions_.push_back(surf_parse_get_int(group)); - linkCountPerNode_ = dimensions_.size(); + num_links_per_node_ = dimensions_.size(); } } -void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { - XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id()); + XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); - if (dst->isRouter() || src->isRouter()) + if (dst->is_router() || src->is_router()) return; - if (src->id() == dst->id() && hasLoopback_) { - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); + if (src->id() == dst->id() && has_loopback_) { + std::pair info = private_links_.at(src->id() * num_links_per_node_); - 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(); return; } @@ -112,29 +102,36 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg * Dimension based routing routes through each dimension consecutively * TODO Change to dynamic assignment */ - unsigned int current_node = src->id(); - unsigned int next_node = 0; + /* - * Arrays that hold the coordinates of the current node andthe target; comparing the values at the i-th position of + * Arrays that hold the coordinates of the current node and the target; comparing the values at the i-th position of * both arrays, we can easily assess whether we need to route into this dimension or not. */ - unsigned int myCoords[4]; - rankId_to_coords(src->id(), dimensions_, &myCoords); - unsigned int targetCoords[4]; - rankId_to_coords(dst->id(), dimensions_, &targetCoords); + const unsigned int dsize = dimensions_.size(); + unsigned int* myCoords = new unsigned int[dsize]; + unsigned int* targetCoords= new unsigned int[dsize]; + unsigned int dim_size_product = 1; + for (unsigned i = 0; i < dsize; i++) { + unsigned cur_dim_size = dimensions_[i]; + myCoords[i] = (src->id() / dim_size_product) % cur_dim_size; + targetCoords[i] = (dst->id() / dim_size_product) % cur_dim_size; + dim_size_product *= cur_dim_size; + } + /* * linkOffset describes the offset where the link we want to use is stored(+1 is added because each node has a link * from itself to itself, which can only be the case if src->m_id == dst->m_id -- see above for this special case) */ - int nodeOffset = (dimensions_.size() + 1) * src->id(); + int nodeOffset = (dsize + 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 + bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"? false means: next -> cur + unsigned int current_node = src->id(); while (current_node != dst->id()) { + unsigned int next_node = 0; unsigned int dim_product = 1; // First, we will route in x-dimension - int j=0; - for (auto const& cur_dim : dimensions_) { + for (unsigned j = 0; j < dsize; j++) { + const unsigned cur_dim = dimensions_[j]; // current_node/dim_product = position in current dimension if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) { @@ -149,8 +146,8 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg next_node = (current_node + dim_product); // HERE: We use *CURRENT* node for calculation (as opposed to next_node) - nodeOffset = current_node * (linkCountPerNode_); - linkOffset = nodeOffset + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0) + j; + nodeOffset = current_node * (num_links_per_node_); + linkOffset = nodeOffset + (has_loopback_ ? 1 : 0) + (has_limiter_ ? 1 : 0) + j; use_lnk_up = true; assert(linkOffset >= 0); } else { // Route to the left @@ -160,8 +157,8 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg next_node = (current_node - dim_product); // HERE: We use *next* node for calculation (as opposed to current_node!) - nodeOffset = next_node * (linkCountPerNode_); - linkOffset = nodeOffset + j + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0); + nodeOffset = next_node * (num_links_per_node_); + linkOffset = nodeOffset + j + (has_loopback_ ? 1 : 0) + (has_limiter_ ? 1 : 0); use_lnk_up = false; assert(linkOffset >= 0); @@ -171,31 +168,27 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg break; } - j++; dim_product *= cur_dim; } - std::pair info; + std::pair info; - if (hasLimiter_) { // limiter for sender - info = privateLinks_.at(nodeOffset + (hasLoopback_ ? 1 : 0)); - route->link_list->push_back(info.first); + if (has_limiter_) { // limiter for sender + info = private_links_.at(nodeOffset + (has_loopback_ ? 1 : 0)); + route->link_list.push_back(info.first); } - info = privateLinks_.at(linkOffset); + info = private_links_.at(linkOffset); + resource::LinkImpl* lnk = use_lnk_up ? info.first : info.second; + + route->link_list.push_back(lnk); + if (lat) + *lat += lnk->get_latency(); - if (use_lnk_up == false) { - route->link_list->push_back(info.second); - if (lat) - *lat += info.second->latency(); - } else { - route->link_list->push_back(info.first); - if (lat) - *lat += info.first->latency(); - } current_node = next_node; - next_node = 0; } + delete[] myCoords; + delete[] targetCoords; } } }