Do connect all log channel manually to parent using XBT_LOG_CONNECT() too, so that...

[simgrid.git] / src / xbt / xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index f443f17..00de65f 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -31,12 +31,39 @@ xbt_init(int *argc, char **argv) {
   if (xbt_initialized!=1)
     return;
 
   if (xbt_initialized!=1)
     return;
 

+  /* Connect our log channels: that must be done manually under windows */
+  XBT_LOG_CONNECT(graphxml_parse, xbt);
+  XBT_LOG_CONNECT(log, xbt);
+  XBT_LOG_CONNECT(module, xbt);
+  XBT_LOG_CONNECT(peer, xbt);
+  XBT_LOG_CONNECT(strbuff, xbt);
+  XBT_LOG_CONNECT(xbt_cfg, xbt);
+  XBT_LOG_CONNECT(xbt_dict_add, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_collapse, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_cursor, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_elm, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_remove, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict_search, xbt_dict);
+  XBT_LOG_CONNECT(xbt_dict, xbt);
+  XBT_LOG_CONNECT(xbt_dyn, xbt);
+  XBT_LOG_CONNECT(xbt_ex, xbt);
+  XBT_LOG_CONNECT(xbt_fifo, xbt);
+  XBT_LOG_CONNECT(xbt_graph, xbt);
+  XBT_LOG_CONNECT(xbt_matrix, xbt);
+  XBT_LOG_CONNECT(xbt_queue, xbt);
+  XBT_LOG_CONNECT(xbt_set, xbt);
+  XBT_LOG_CONNECT(xbt_sync_os, xbt);
+  XBT_LOG_CONNECT(xbt_sync_rl, xbt);
+   

   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int)time(NULL));
   VERB0("Initialize XBT");
   
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int)time(NULL));
   VERB0("Initialize XBT");
   

+  xbt_backtrace_init();

   xbt_log_init(argc,argv);
   xbt_log_init(argc,argv);

-  xbt_thread_mod_init();
+  xbt_os_thread_mod_init();
+  xbt_context_mod_init();

 }
 
 /** @brief Finalize the xbt mechanisms. */
 }
 
 /** @brief Finalize the xbt mechanisms. */


@@ -44,11 +71,15 @@ void
 xbt_exit(){
   xbt_initialized--;
   if (xbt_initialized == 0) {
 xbt_exit(){
   xbt_initialized--;
   if (xbt_initialized == 0) {

-    free(xbt_binary_name);

     xbt_fifo_exit();
     xbt_dict_exit();
     xbt_fifo_exit();
     xbt_dict_exit();

-    xbt_thread_mod_exit();
+    xbt_context_mod_exit();
+    xbt_os_thread_mod_exit();
+    xbt_log_exit();
+    xbt_backtrace_exit();

   }
   }

-  xbt_log_exit();
+   
+  if (xbt_initialized == 0)
+    free(xbt_binary_name);

 }
 
 }