X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ee04bb4b77788c1f17220a2117f41573c9dcde..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index 1a684e7291..1d01cc9bcc 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -31,7 +31,7 @@ TorusZone::TorusZone(NetZone* father, std::string name) : ClusterZone(father, na { } -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 @@ -54,7 +54,7 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int sg_platf_new_link(&link); surf::LinkImpl* linkUp; surf::LinkImpl* linkDown; - if (link.policy == SURF_LINK_FULLDUPLEX) { + if (link.policy == SURF_LINK_SPLITDUPLEX) { std::string tmp_link = link_id + "_UP"; linkUp = surf::LinkImpl::byName(tmp_link); tmp_link = link_id + "_DOWN"; @@ -91,7 +91,7 @@ void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster) } } -void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void TorusZone::getLocalRoute(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());