X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/99e140940d63cd23369a0aad5e47d2af92a34e16..9579c93344a2264c88576dde6dd825512f897c3b:/src/instr/instr_routing.c

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 69a86730ee..28e387107e 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -146,13 +146,15 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t
       //get the route
       route_t route = xbt_new0(s_route_t,1);
       route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-      rc->get_route_and_latency (rc,
-          (network_element_t)(child1->net_elm),
-          (network_element_t)(child2->net_elm),route, NULL);
+      rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
+                                route, NULL);
 
       //user might want to extract a graph using routes with only one link
       //see --cfg=tracing/onelink_only:1 or --help-tracing for details
-      if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1) continue;
+      if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1){
+        generic_free_route(route);
+        continue;
+      }
 
       //traverse the route connecting the containers
       unsigned int cpt;
@@ -305,7 +307,6 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host)
     if (msg_process == NULL){
       msg_process = PJ_type_container_new("MSG_PROCESS", new->type);
       type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
-      PJ_value_new ("executing", "0 1 0", state);
       PJ_value_new ("suspend", "1 0 1", state);
       PJ_value_new ("sleep", "1 1 0", state);
       PJ_value_new ("receive", "1 0 0", state);
@@ -472,9 +473,8 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
       //get the route
       route_t route = xbt_new0(s_route_t,1);
       route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-      rc->get_route_and_latency (rc,
-          (network_element_t)(child1->net_elm),
-          (network_element_t)(child2->net_elm),route, NULL);
+      rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
+                                route, NULL);
 
       //user might want to extract a graph using routes with only one link
       //see --cfg=tracing/onelink_only:1 or --help-tracing for details