X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45215d34aa47fd215a498fdecf91b8050b3feb4f..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 66a0d1a231..354272f590 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;
@@ -502,13 +504,9 @@ static void _get_route_and_latency(const char *src, const char *dst,
   /* If src and dst are in the same AS, life is good */
   if (src_father == dst_father) {       /* SURF_ROUTING_BASE */
 
-    route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+    route.link_list = *links;
 
-    common_father->get_route(common_father, src, dst, &route);
-    *links = route.link_list;
-
-    if (latency)
-      *latency += common_father->get_latency(common_father, src, dst, &route);
+    common_father->get_route_and_latency(common_father, src, dst, &route,latency);
 
     xbt_free(route.src_gateway);
     xbt_free(route.dst_gateway);
@@ -523,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 supurious 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);
     }
@@ -538,60 +536,39 @@ static void _get_route_and_latency(const char *src, const char *dst,
 
   /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/
 
-  route_t e_route_cnt = xbt_new0(s_route_t, 1);
-  e_route_cnt->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
-  common_father->get_route(common_father, src_father->name, dst_father->name, e_route_cnt);
-
-  xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
-      src_father->name, dst_father->name);
+  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((e_route_cnt->src_gateway == NULL) ==
-      (e_route_cnt->dst_gateway == NULL),
-      "bad gateway for route between \"%s\" and \"%s\"", src, dst);
-
-  *links = xbt_dynar_new(global_routing->size_of_link, NULL);
-
-  if (latency) {
-    *latency += common_father->get_latency(common_father,
-        src_father->name, dst_father->name,
-        e_route_cnt);
-  }
+  xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
+      "bad gateways for route from \"%s\" to \"%s\"", src, dst);
 
+  char*src_gateway = route.src_gateway;
+  char*dst_gateway = route.dst_gateway;
 
   /* If source gateway is not our source, we have to recursively find our way up to this point */
-  if (strcmp(src, e_route_cnt->src_gateway)) {
-    xbt_dynar_t route_src;
+  if (strcmp(src, src_gateway))
+    _get_route_and_latency(src, src_gateway, links, latency);
 
-    _get_route_and_latency(src, e_route_cnt->src_gateway,
-        (links ? &route_src : NULL),
-        latency);
-
-    xbt_dynar_foreach(route_src, cpt, link) {
-      xbt_dynar_push(*links, &link);
-    }
-    xbt_dynar_free(&route_src);
-  }
-
-  xbt_dynar_foreach(e_route_cnt->link_list, cpt, link) {
+  xbt_dynar_foreach(route.link_list, cpt, link) {
     xbt_dynar_push(*links, &link);
   }
 
   /* If dest gateway is not our destination, we have to recursively find our way from this point */
-  if (strcmp(e_route_cnt->dst_gateway, dst)) {
-    xbt_dynar_t route_dst;
+  // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples??
+  if (strcmp(dst_gateway, dst)) {
+    xbt_dynar_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL);
 
-    _get_route_and_latency(e_route_cnt->dst_gateway, dst,
-        (links ? &route_dst : NULL),
-        latency);
+    _get_route_and_latency(dst_gateway, dst, &route_dst, latency);
 
     xbt_dynar_foreach(route_dst, cpt, link) {
       xbt_dynar_push(*links, &link);
     }
     xbt_dynar_free(&route_dst);
-
   }
 
-  generic_free_route(e_route_cnt);
+  xbt_free(src_gateway);
+  xbt_free_f(dst_gateway);
+  xbt_dynar_free(&route.link_list);
 }
 
 /**