Use a mallocator for the Surf actions

[simgrid.git] / src / msg / global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index ef50ebe..46f25b5 100644 (file)
--- 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;
 }
 
@@ -220,7 +220,7 @@ MSG_error_t MSG_clean(void)
 /** \ingroup msg_easier_life
  * \brief A clock (in second).
  */
-double MSG_get_clock(void)
+XBT_INLINE double MSG_get_clock(void)
 {
   return SIMIX_get_clock();
 }