X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec4e2d87d99b8ad76c9096033eb858e9052b09fa..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/surf_routing_cluster_torus.cpp diff --git a/src/surf/surf_routing_cluster_torus.cpp b/src/surf/surf_routing_cluster_torus.cpp index 645a313d92..e09daf11d1 100644 --- a/src/surf/surf_routing_cluster_torus.cpp +++ b/src/surf/surf_routing_cluster_torus.cpp @@ -4,7 +4,8 @@ /* 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 "surf_routing_cluster_torus.hpp" +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_cluster_torus.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf"); @@ -62,12 +63,12 @@ void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int memset(&link, 0, sizeof(link)); current_dimension = xbt_dynar_get_as(p_dimensions, j, int); neighbour_rank_id = ( ((int) rank / dim_product) % current_dimension == current_dimension-1) ? rank - (current_dimension-1)*dim_product : rank + dim_product; - //name of neighbour is not right for non contiguous cluster radicals (as id != rank in this case) + //name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case) link_id = bprintf("%s_link_from_%i_to_%i", cluster->id, id, neighbour_rank_id); link.id = link_id; link.bandwidth = cluster->bw; link.latency = cluster->lat; - link.state = SURF_RESOURCE_ON; + link.initiallyOn = 1; link.policy = cluster->sharing_policy; sg_platf_new_link(&link); s_surf_parsing_link_up_down_t info;