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

diff --git a/src/msg/global.c b/src/msg/global.c
index 46f25b58a2..6aa780db65 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -64,8 +64,6 @@ 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;
@@ -73,13 +71,16 @@ void MSG_global_init(int *argc, char **argv)
     /* 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
@@ -109,7 +110,7 @@ void MSG_global_init(int *argc, char **argv)
  */
 MSG_error_t MSG_set_channel_number(int number)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel == 0),
               "Channel number already set!");
 
@@ -127,7 +128,7 @@ MSG_error_t MSG_set_channel_number(int number)
  */
 int MSG_get_channel_number(void)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel != 0),
               "Channel number not set yet!");
 
@@ -161,13 +162,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,23 +178,12 @@ int MSG_process_killall(int reset_PIDs)
  */
 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_surf_release();
 #endif
 
-  while ((p = xbt_fifo_pop(msg_global->process_list))) {
-    MSG_process_kill(p);
-  }
-
-  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);
+  MSG_process_killall(0);
 
   free(msg_global);
   msg_global = NULL;
@@ -213,6 +197,11 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
+  // Exit the LIB host_lib
+  xbt_lib_free(&host_lib);
+  xbt_lib_free(&link_lib);
+  xbt_lib_free(&as_router_lib);
+
   return MSG_OK;
 }