X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0c5e1a0a928d8bc285d5d48c6cdaa75d9c9b7ef..1b4e20873a7bd405842f3d8d1e6dd1d518db5535:/src/surf/surf_routing_generic.c

diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c
index a45728659d..9c0d4f9714 100644
--- a/src/surf/surf_routing_generic.c
+++ b/src/surf/surf_routing_generic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2009-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -143,8 +143,6 @@ void generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
   int src, dst;
   int table_size = xbt_dynar_length(rc->index_network_elm);
 
-  sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-  route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 
   for (src = 0; src < table_size; src++) {
     sg_routing_edge_t my_src =
@@ -155,45 +153,49 @@ void generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
       sg_routing_edge_t my_dst =
           xbt_dynar_get_as(rc->index_network_elm, dst, sg_routing_edge_t);
 
+      sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+      route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+
       rc->get_route_and_latency(rc, my_src, my_dst, route, NULL);
 
       XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name, my_dst->name);
 
-      if (route) {
-        unsigned int cpt;
-        void *link;
-
-        xbt_node_t current, previous;
-        const char *previous_name, *current_name;
+      unsigned int cpt;
+      void *link;
 
-        if (route->gw_src) {
-          previous = new_xbt_graph_node(graph, route->gw_src->name, nodes);
-          previous_name = route->gw_src->name;
-        } else {
-          previous = new_xbt_graph_node(graph, my_src->name, nodes);
-          previous_name = my_src->name;
-        }
+      xbt_node_t current, previous;
+      const char *previous_name, *current_name;
 
-        xbt_dynar_foreach(route->link_list, cpt, link) {
-          char *link_name = ((surf_resource_t) link)->name;
-          current = new_xbt_graph_node(graph, link_name, nodes);
-          current_name = link_name;
-          new_xbt_graph_edge(graph, previous, current, edges);
-          XBT_DEBUG ("  %s -> %s", previous_name, current_name);
-          previous = current;
-          previous_name = current_name;
-        }
+      if (route->gw_src) {
+        previous = new_xbt_graph_node(graph, route->gw_src->name, nodes);
+        previous_name = route->gw_src->name;
+      } else {
+        previous = new_xbt_graph_node(graph, my_src->name, nodes);
+        previous_name = my_src->name;
+      }
 
-        if (route->gw_dst) {
-          current = new_xbt_graph_node(graph, route->gw_dst->name, nodes);
-          current_name = route->gw_dst->name;
-        } else {
-          current = new_xbt_graph_node(graph, my_dst->name, nodes);
-          current_name = my_dst->name;
-        }
+      xbt_dynar_foreach(route->link_list, cpt, link) {
+        char *link_name = ((surf_resource_t) link)->name;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        current_name = link_name;
         new_xbt_graph_edge(graph, previous, current, edges);
         XBT_DEBUG ("  %s -> %s", previous_name, current_name);
+        previous = current;
+        previous_name = current_name;
+      }
+
+      if (route->gw_dst) {
+        current = new_xbt_graph_node(graph, route->gw_dst->name, nodes);
+        current_name = route->gw_dst->name;
+      } else {
+        current = new_xbt_graph_node(graph, my_dst->name, nodes);
+        current_name = my_dst->name;
       }
+      new_xbt_graph_edge(graph, previous, current, edges);
+      XBT_DEBUG ("  %s -> %s", previous_name, current_name);
+
+      xbt_dynar_free (&(route->link_list));
+      xbt_free (route);
     }
   }
 }