From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 6 Dec 2010 00:55:56 +0000 (+0000)
Subject: [trace] end must be called while surf configuration still exist
X-Git-Tag: v3.6_beta2~931
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b9ac20f457fd260735c156a3dc5baa30be97e9c6?ds=sidebyside

[trace] end must be called while surf configuration still exist

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

diff --git a/src/msg/global.c b/src/msg/global.c
index ef50ebe572..eaf3e195a5 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -207,12 +207,12 @@ MSG_error_t MSG_clean(void)
   /* initialization of the action module */
   _MSG_action_exit();
 
-  SIMIX_clean();
-
 #ifdef HAVE_TRACING
   TRACE_end();
 #endif
 
+  SIMIX_clean();
+
   return MSG_OK;
 }
 
diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index c24ce295be..29dbf9631e 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -410,15 +410,16 @@ void SD_exit(void)
     xbt_free(sd_global);
     sd_global = NULL;
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+
     DEBUG0("Exiting Surf...");
     surf_exit();
   } else {
     WARN0("SD_exit() called, but SimDag is not running");
     /* we cannot use exceptions here because xbt is not running! */
   }
-#ifdef HAVE_TRACING
-  TRACE_end();
-#endif
 }
 
 /**