From: degomme <degomme@localhost.localdomain>
Date: Tue, 10 Jun 2014 13:09:35 +0000 (+0200)
Subject: torus should provide better results if latency is taken into account ..
X-Git-Tag: v3_12~991
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3c89e084af54896c9dcd71ab064bbfc08dfffb64?hp=f5336306d4e4bfc2c0bd979bbb4cb875fa922a4a

torus should provide better results if latency is taken into account ..
---

diff --git a/src/surf/surf_routing_cluster_torus.cpp b/src/surf/surf_routing_cluster_torus.cpp
index 45b8a935c7..52d0c35960 100644
--- a/src/surf/surf_routing_cluster_torus.cpp
+++ b/src/surf/surf_routing_cluster_torus.cpp
@@ -218,11 +218,17 @@ void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
 
        info = xbt_dynar_get_as(p_linkUpDownList,linkOffset, s_surf_parsing_link_up_down_t);
 
-       if (use_lnk_up == false)
+       if (use_lnk_up == false){
            xbt_dynar_push_as(route->link_list,void*,info.link_down);
-       else
+
+       if (lat)
+         *lat += static_cast<NetworkLinkPtr>(info.link_down)->getLatency();
+       }else{
            xbt_dynar_push_as(route->link_list,void*,info.link_up);
 
+       if (lat)
+         *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+       }
        current_node = next_node;
        next_node = 0;
      }