Add an unused (for the moment) module file

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

diff --git a/src/msg/global.c b/src/msg/global.c
index bee1308..9ac1659 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -64,15 +64,13 @@ void MSG_global_init(int *argc, char **argv)
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
+    s_m_process_t p;
+    msg_global->process_list = xbt_swag_new(xbt_swag_offset(p, process_list_hookup));
     msg_global->host = xbt_fifo_new();
-    msg_global->process_list = xbt_fifo_new();
     msg_global->max_channel = 0;
     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 +78,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 +143,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;
 }
 
@@ -166,7 +165,7 @@ int MSG_process_killall(int reset_PIDs)
   m_process_t p = NULL;
   m_process_t self = MSG_process_self();
 
-  while ((p = xbt_fifo_pop(msg_global->process_list))) {
+  while ((p = xbt_swag_extract(msg_global->process_list))) {
     if (p != self)
       MSG_process_kill(p);
   }
@@ -193,7 +192,7 @@ MSG_error_t MSG_clean(void)
   TRACE_surf_release();
 #endif
 
-  while ((p = xbt_fifo_pop(msg_global->process_list))) {
+  while ((p = xbt_swag_extract(msg_global->process_list))) {
     MSG_process_kill(p);
   }
 
@@ -201,17 +200,18 @@ MSG_error_t MSG_clean(void)
     __MSG_host_destroy(h);
   }
   xbt_fifo_free(msg_global->host);
-  xbt_fifo_free(msg_global->process_list);
+  xbt_swag_free(msg_global->process_list);
 
   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 +221,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();
 }