X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3735c4ed8e2ea50363481f903209da4a35f3d44..f96c4337f949604e5d4e4b30f3ff6418ddf831ee:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index f6b5c4ed89..3a5f19f20c 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -251,6 +251,7 @@ static void routing_parse_E_route(void)
              "no defined method \"set_route\" in \"%s\"",
              current_routing->name);
   current_routing->parse_route(current_routing, src, dst, route);
+  generic_free_route(route);
   parsed_link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -269,6 +270,7 @@ static void routing_parse_E_ASroute(void)
              "no defined method \"set_ASroute\" in \"%s\"",
              current_routing->name);
   current_routing->parse_ASroute(current_routing, src, dst, e_route);
+  generic_free_route(e_route);
   parsed_link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -519,10 +521,10 @@ static void _get_route_and_latency(const char *src, const char *dst,
 
   if (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
     if (latency)
-      xbt_die("Bypass cannot work yet with get_latency"); // FIXME: that limitation seems spurious to me -- check with alvin
-
-    *links = xbt_dynar_new(global_routing->size_of_link, NULL);
+      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
     xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
       xbt_dynar_push(*links, &link);
     }
@@ -537,8 +539,7 @@ static void _get_route_and_latency(const char *src, const char *dst,
   route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
   common_father->get_route_and_latency(common_father, src_father->name, dst_father->name, &route,latency);
 
-  xbt_assert((route.src_gateway == NULL) ==
-      (route.dst_gateway == NULL),
+  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);