Do not request status if not requested by caller.

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

diff --git a/src/msg/global.c b/src/msg/global.c
index a6e0c91..7629d66 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg/private.h"
+#include "mc/mc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/virtu.h"
@@ -47,6 +48,10 @@ XBT_LOG_EXTERNAL_CATEGORY(msg_process);
  */
 void MSG_global_init(int *argc, char **argv)
 {
+#ifdef HAVE_TRACING
+  TRACE_global_init(argc, argv);
+#endif
+
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
     /* Connect our log channels: that must be done manually under windows */
@@ -75,6 +80,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
@@ -139,8 +147,13 @@ MSG_error_t MSG_main(void)
   fflush(stderr);
   SIMIX_init();
 
-  while (SIMIX_solve(NULL, NULL) != -1.0);
-  
+#ifdef HAVE_MC
+  if (_surf_do_model_check)
+    MC_modelcheck(1);
+  else
+#endif
+    while (SIMIX_solve(NULL, NULL) != -1.0);
+
   return MSG_OK;
 }
 
@@ -180,7 +193,7 @@ MSG_error_t MSG_clean(void)
   m_process_t p = NULL;
 
 #ifdef HAVE_TRACING
-  TRACE_msg_clean ();
+  TRACE_surf_release();
 #endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {
@@ -204,6 +217,10 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+
   return MSG_OK;
 }