Biggest commit ever (SIMIX2): the user processes can now run in parallel

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 7933918036ca7e89fd221617f0b9aa5c7161e4d5..84894f7207dd44aef90bc5920c5aacf6458a7564 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -49,7 +49,7 @@ XBT_LOG_EXTERNAL_CATEGORY(msg_process);
 void MSG_global_init(int *argc, char **argv)
 {
 #ifdef HAVE_TRACING
-  TRACE_global_init (argc, argv);
+  TRACE_global_init(argc, argv);
 #endif
 
   xbt_getpid = MSG_process_self_PID;
@@ -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,15 @@ 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
+  if (_surf_do_model_check){
+    MC_modelcheck();
+  }else
 #endif
-    while (SIMIX_solve(NULL, NULL) != -1.0);
-  
+  {
+    SIMIX_run();
+  }
   return MSG_OK;
 }
 
@@ -190,7 +190,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))) {
@@ -206,14 +206,15 @@ 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();
 
   SIMIX_clean();
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+
   return MSG_OK;
 }