Add levels to lib host_lib, link_lib and as_router_lib

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 72ea2f0..c7f7d2e 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -48,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 */
@@ -61,21 +65,23 @@ void MSG_global_init(int *argc, char **argv)
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
     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();
 
-    SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
-    SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
-    SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
+    SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
+    SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
+    SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
   }
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
+
+  XBT_DEBUG("ADD MSG LEVELS");
+  MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
 }
 
 /** \defgroup m_channel_management    Understanding channels
@@ -138,15 +144,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;
 }
 
@@ -159,13 +163,7 @@ MSG_error_t MSG_main(void)
  */
 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))) {
-    if (p != self)
-      MSG_process_kill(p);
-  }
+  SIMIX_req_process_killall();
 
   if (reset_PIDs > 0) {
     msg_global->PID = reset_PIDs;
@@ -183,31 +181,28 @@ MSG_error_t MSG_clean(void)
 {
   xbt_fifo_item_t i = NULL;
   m_host_t h = NULL;
-  m_process_t p = NULL;
 
 #ifdef HAVE_TRACING
-  TRACE_msg_clean ();
+  TRACE_surf_release();
 #endif
 
-  while ((p = xbt_fifo_pop(msg_global->process_list))) {
-    MSG_process_kill(p);
-  }
+  MSG_process_killall(0);
 
   xbt_fifo_foreach(msg_global->host, i, h, m_host_t) {
     __MSG_host_destroy(h);
   }
   xbt_fifo_free(msg_global->host);
-  xbt_fifo_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;
@@ -217,7 +212,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();
 }