Add a platform with a bypass route. Add the test to cmake.

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 3a5f19f..354272f 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -523,8 +523,8 @@ static void _get_route_and_latency(const char *src, const char *dst,
     if (latency)
       xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route
 
-    // FIXME this path is never tested. I need examples to check the bypass mechanism...
-    THROW_UNIMPLEMENTED; // let's warn the users of the problem
+//    // FIXME this path is never tested. I need examples to check the bypass mechanism...
+//    THROW_UNIMPLEMENTED; // let's warn the users of the problem
     xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
       xbt_dynar_push(*links, &link);
     }
@@ -542,8 +542,6 @@ static void _get_route_and_latency(const char *src, const char *dst,
   xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
       "bad gateways for route from \"%s\" to \"%s\"", src, dst);
 
-  *links = xbt_dynar_new(global_routing->size_of_link, NULL);
-
   char*src_gateway = route.src_gateway;
   char*dst_gateway = route.dst_gateway;
 
@@ -566,8 +564,11 @@ static void _get_route_and_latency(const char *src, const char *dst,
       xbt_dynar_push(*links, &link);
     }
     xbt_dynar_free(&route_dst);
-
   }
+
+  xbt_free(src_gateway);
+  xbt_free_f(dst_gateway);
+  xbt_dynar_free(&route.link_list);
 }
 
 /**