Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 02b300c..55d4b0a 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -64,7 +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->max_channel = 0;
     msg_global->PID = 1;
     msg_global->sent_msg = 0;
@@ -79,6 +78,9 @@ void MSG_global_init(int *argc, char **argv)
 #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
@@ -108,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!");
 
@@ -126,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!");
 
@@ -176,8 +178,6 @@ int MSG_process_killall(int reset_PIDs)
  */
 MSG_error_t MSG_clean(void)
 {
-  xbt_fifo_item_t i = NULL;
-  m_host_t h = NULL;
 
 #ifdef HAVE_TRACING
   TRACE_surf_release();
@@ -185,11 +185,6 @@ MSG_error_t MSG_clean(void)
 
   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);
-
   free(msg_global);
   msg_global = NULL;