X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..96e88da53587bca891dce3ddb7772eff544e96be:/src/msg/global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index bee130881d..46f25b58a2 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -70,9 +70,6 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->PID = 1;
     msg_global->sent_msg = 0;
 
-    /* initialization of the mailbox module */
-    MSG_mailbox_mod_init();
-
     /* initialization of the action module */
     _MSG_action_init();
 
@@ -80,6 +77,9 @@ void MSG_global_init(int *argc, char **argv)
     SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
     SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
   }
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
 }
 
 /** \defgroup m_channel_management    Understanding channels
@@ -142,15 +142,13 @@ MSG_error_t MSG_main(void)
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
-  SIMIX_init();
-
-#ifdef HAVE_MC
-  if (_surf_do_model_check)
-    MC_modelcheck(1);
-  else
-#endif
-    while (SIMIX_solve(NULL, NULL) != -1.0);
 
+  if (MC_IS_ENABLED) {
+    MC_modelcheck();
+  }
+  else {
+    SIMIX_run();
+  }
   return MSG_OK;
 }
 
@@ -206,12 +204,13 @@ MSG_error_t MSG_clean(void)
   free(msg_global);
   msg_global = NULL;
 
-  /* cleanup all resources in the mailbox module */
-  MSG_mailbox_mod_exit();
-
   /* initialization of the action module */
   _MSG_action_exit();
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+
   SIMIX_clean();
 
   return MSG_OK;
@@ -221,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();
 }