[trace] keep tracing data structures until the very last moment before shutdown

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9312 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 9ee6472..5bd8b1d 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -59,9 +59,6 @@ int TRACE_end()
   if (!TRACE_is_active())
     return 1;
 
-  /* close the trace file */
-  TRACE_paje_end();
-
   /* generate uncategorized graph configuration for triva */
   if (TRACE_get_triva_uncat_conf()){
     TRACE_generate_triva_uncat_conf();
@@ -72,6 +69,12 @@ int TRACE_end()
     TRACE_generate_triva_cat_conf();
   }
 
+  /* destroy all data structures of tracing (and free) */
+  destroyAllContainers();
+
+  /* close the trace file */
+  TRACE_paje_end();
+
   /* activate trace */
   TRACE_desactivate ();
   DEBUG0("Tracing system is shutdown");

diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c
index b32d089..8df49ad 100644 (file)
--- a/src/instr/instr_surf.c
+++ b/src/instr/instr_surf.c
@@ -19,7 +19,6 @@ void TRACE_surf_alloc(void)
 void TRACE_surf_release(void)
 {
   TRACE_surf_resource_utilization_release();
-  destroyAllContainers();
 }
 
 static void TRACE_surf_set_resource_variable(double date,