kill routing_get_route(), use routing_get_route_and_latency() instead

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 0c45add..8753f1a 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -413,7 +413,8 @@ static void net_update_actions_state(double now, double delta)
     }
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
-      xbt_dynar_t route = routing_get_route(action->src_name, action->dst_name);
+      xbt_dynar_t route;
+      routing_get_route_and_latency(action->src_name, action->dst_name,&route,NULL,1);
       link_CM02_t link;
       unsigned int i;
       xbt_dynar_foreach(route, i, link) {
@@ -589,7 +590,7 @@ static surf_action_t net_communicate(const char *src_name,
   routing_get_route_and_latency(src_name, dst_name, &route, &latency, 0);
 
   if (sg_network_fullduplex == 1) {
-    back_route = routing_get_route(dst_name, src_name);
+    routing_get_route_and_latency(dst_name, src_name, &back_route,NULL,1);
   }
 
   /* LARGE PLATFORMS HACK:
@@ -722,7 +723,9 @@ static surf_action_t net_communicate(const char *src_name,
 
 static xbt_dynar_t net_get_route(const char *src, const char *dst)
 {
-  return routing_get_route(src, dst);
+  xbt_dynar_t route;
+  routing_get_route_and_latency(src, dst,&route, NULL,1);
+  return route;
 }
 
 static double net_get_link_bandwidth(const void *link)