From 8e2e629ea81607a0687ef08e2630c5fc1403688b Mon Sep 17 00:00:00 2001 From: Jonathan Rouzaud-Cornabas Date: Fri, 12 Oct 2012 10:32:58 +0200 Subject: [PATCH] Fix an issue in TRACE_msg_vm_kill() --- src/instr/instr_msg_vm.c | 9 +++++---- src/instr/instr_routing.c | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/instr/instr_msg_vm.c b/src/instr/instr_msg_vm.c index 441c115dd8..afbd5287bf 100644 --- a/src/instr/instr_msg_vm.c +++ b/src/instr/instr_msg_vm.c @@ -66,14 +66,15 @@ void TRACE_msg_vm_create (const char *vm_name, msg_host_t host) } } -void TRACE_msg_vm_kill(msg_vm_t vm) -{ - if (TRACE_msg_vm_is_enabled()){ +void TRACE_msg_vm_kill(msg_vm_t vm) { + if (TRACE_msg_vm_is_enabled()) { int len = INSTR_DEFAULT_STR_SIZE; char str[INSTR_DEFAULT_STR_SIZE]; //kill means that this vm no longer exists, let's destroy it - PJ_container_free (PJ_container_get (instr_vm_id(vm, str, len))); + container_t process = PJ_container_get (instr_vm_id(vm, str, len)); + PJ_container_remove_from_parent (process); + PJ_container_free (process); } } diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 23a6553506..2261801a52 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -166,11 +166,6 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t //if child1 is not child2 if (strcmp (child1_name, child2_name) == 0) continue; - if (graph_extraction_filter_out (child1, NULL)) continue; - xbt_dict_foreach(container->children, cursor2, child2_name, child2) { - if (graph_extraction_filter_out (child2, child1)) continue; - XBT_DEBUG ("get_route from %s to %s", child1_name, child2_name); - //get the route 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); -- 2.20.1