X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/485fa582bda7c51fb184bf0f82d0eb250be9f805..72884f9c682441d0a9de0f2df63b47cde7822058:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index f17a7d3a8f..fe93efd1c4 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -20,18 +20,19 @@ namespace simgrid { namespace kernel { namespace routing { -void TorusZone::create_torus_links(int id, int rank, unsigned int position) +void TorusZone::create_torus_links(unsigned long id, int rank, unsigned long 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++) { - int current_dimension = dimensions_[j]; // which dimension are we currently in? - // we need to iterate over all dimensions and create all links there + for (unsigned long j = 0; j < dimensions_.size(); j++) { + unsigned long 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 = ((rank / dim_product) % current_dimension == current_dimension - 1) - ? rank - (current_dimension - 1) * dim_product - : rank + dim_product; + unsigned long neighbor_rank_id = ((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) std::string link_id = get_name() + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id); const s4u::Link* linkup; @@ -54,11 +55,11 @@ void TorusZone::create_torus_links(int id, int rank, unsigned int position) } } -std::vector TorusZone::parse_topo_parameters(const std::string& topo_parameters) +std::vector TorusZone::parse_topo_parameters(const std::string& topo_parameters) { std::vector dimensions_str; boost::split(dimensions_str, topo_parameters, boost::is_any_of(",")); - std::vector dimensions; + std::vector dimensions; /* We are in a torus cluster * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector. @@ -70,7 +71,7 @@ std::vector TorusZone::parse_topo_parameters(const std::string& to return dimensions; } -void TorusZone::set_topology(const std::vector& dimensions) +void TorusZone::set_topology(const std::vector& dimensions) { xbt_assert(not dimensions.empty(), "Torus dimensions cannot be empty"); dimensions_ = dimensions; @@ -79,7 +80,7 @@ void TorusZone::set_topology(const std::vector& dimensions) void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { - XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); + XBT_VERB("torus getLocalRoute from '%s'[%lu] to '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); if (dst->is_router() || src->is_router()) return; @@ -101,11 +102,11 @@ void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* * both arrays, we can easily assess whether we need to route into this dimension or not. */ const unsigned long dsize = dimensions_.size(); - std::vector myCoords(dsize); - std::vector targetCoords(dsize); + std::vector myCoords(dsize); + std::vector targetCoords(dsize); unsigned int dim_size_product = 1; for (unsigned long i = 0; i < dsize; i++) { - unsigned cur_dim_size = dimensions_[i]; + unsigned long 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; @@ -118,12 +119,12 @@ void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* unsigned long linkOffset = (dsize + 1) * src->id(); 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(); + unsigned long 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 - for (unsigned j = 0; j < dsize; j++) { - const unsigned cur_dim = dimensions_[j]; + unsigned long next_node = 0; + unsigned long dim_product = 1; // First, we will route in x-dimension + for (unsigned long j = 0; j < dsize; j++) { + const unsigned long 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) { if ((targetCoords[j] > myCoords[j] && @@ -149,7 +150,7 @@ void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* linkOffset = node_pos_with_loopback_limiter(next_node) + j; use_lnk_up = false; } - XBT_DEBUG("torus_get_route_and_latency - current_node: %u, next_node: %u, linkOffset is %lu", current_node, + XBT_DEBUG("torus_get_route_and_latency - current_node: %lu, next_node: %lu, linkOffset is %lu", current_node, next_node, linkOffset); break; } @@ -184,7 +185,7 @@ void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* namespace s4u { -NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector& dimensions, +NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector& dimensions, const ClusterCallbacks& set_callbacks, double bandwidth, double latency, Link::SharingPolicy sharing_policy) {