From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Thu, 16 Jun 2011 10:59:07 +0000 (+0200)
Subject: [trace] fix, free memory even if user requests the non-destruction of containers
X-Git-Tag: v3_6_rc3~2^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a1250a4c082808ccd2c95a2691aa6e734313c22b?ds=sidebyside

[trace] fix, free memory even if user requests the non-destruction of containers
---

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 2259d514c9..fa2569b072 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -107,9 +107,7 @@ int TRACE_end()
   TRACE_paje_dump_buffer(1);
 
   /* destroy all data structures of tracing (and free) */
-  if (!TRACE_disable_destroy()){
-    destroyAllContainers();
-  }
+  destroyAllContainers();
 
   /* close the trace file */
   TRACE_paje_end();
diff --git a/src/instr/instr_paje.c b/src/instr/instr_paje.c
index 1bc7133d36..3c1591c188 100644
--- a/src/instr/instr_paje.c
+++ b/src/instr/instr_paje.c
@@ -310,7 +310,10 @@ void destroyContainer (container_t container)
   TRACE_paje_dump_buffer(1);
 
   //trace my destruction
-  new_pajeDestroyContainer(container);
+  if (!TRACE_disable_destroy()){
+    //do not trace the container destruction if user requests
+    new_pajeDestroyContainer(container);
+  }
 
   //free
   xbt_free (container->name);