From 8fef98ecb9454a54f606551e8d9a2e3a95259b42 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 7 Oct 2013 17:51:13 +0200
Subject: [PATCH] Rather call TRACE_end() at surf level.

---
 src/simix/smx_global.c | 3 ---
 src/surf/surf.c        | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 7af670a28e..d91c628130 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -125,9 +125,6 @@ void SIMIX_global_init(int *argc, char **argv)
  */
 static void SIMIX_clean(void)
 {
-#ifdef HAVE_TRACING
-  TRACE_end();
-#endif
 #ifdef TIME_BENCH_PER_SR
   smx_ctx_raw_new_sr();
 #endif
diff --git a/src/surf/surf.c b/src/surf/surf.c
index 3835bc6fb5..8c3be87c0d 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -466,6 +466,11 @@ void surf_exit(void)
   unsigned int iter;
   surf_model_t model = NULL;
 
+#ifdef HAVE_TRACING
+  TRACE_end();                  /* Just in case it was not called by the upper
+                                 * layer (or there is no upper layer) */
+#endif
+
   sg_config_finalize();
 
   xbt_dynar_foreach(model_list, iter, model)
-- 
2.20.1