X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..d5cbd0a045f9b4c686d265723f542dd92f47593b:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index b3b83dfac4..4992637081 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -64,8 +64,8 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int linkDown = linkUp; } /* - * Add the link to its appropriate position; - * note that position rankId*(xbt_dynar_length(dimensions)+has_loopback?+has_limiter?) + * Add the link to its appropriate position. + * Note that position rankId*(xbt_dynar_length(dimensions)+has_loopback?+has_limiter?) * holds the link "rankId->rankId" */ privateLinks_.insert({position + j, {linkUp, linkDown}}); @@ -94,8 +94,7 @@ void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster) void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) { - XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->name().c_str(), src->id(), dst->name().c_str(), - dst->id()); + XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id()); if (dst->isRouter() || src->isRouter()) return; @@ -179,7 +178,7 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg std::pair info; if (hasLimiter_) { // limiter for sender - info = privateLinks_.at(nodeOffset + hasLoopback_); + info = privateLinks_.at(nodeOffset + (hasLoopback_ ? 1 : 0)); route->link_list->push_back(info.first); }