Allow to give a priority to _XBT_GNUC_{CONS,DES}TRUCTOR.

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 6c07c33..5660ba7 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -20,50 +20,19 @@
 
 #include "xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
 
+XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
 char *xbt_binary_name = NULL;   /* Mandatory to retrieve neat backtraces */
 int xbt_initialized = 0;
 
-XBT_LOG_EXTERNAL_CATEGORY(graphxml_parse);
-XBT_LOG_EXTERNAL_CATEGORY(log);
-XBT_LOG_EXTERNAL_CATEGORY(module);
-XBT_LOG_EXTERNAL_CATEGORY(peer);
-XBT_LOG_EXTERNAL_CATEGORY(strbuff);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_cursor);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_elm);
-#ifdef XBT_USE_DEPRECATED
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi);
-#endif
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ex);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_graph);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_matrix);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_queue);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_set);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_cbps);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_convert);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_create);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_exchange);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_lexer);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_parse);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_trp);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_trp_meas);
-
 int _surf_do_model_check = 0;   /* this variable is used accros the libraries, and must be declared in XBT so that it's also defined in GRAS (not only in libsimgrid) */
 
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
  * This is crude and rather compiler-specific, unfortunately.
  */
-static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR;
-static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR;
+static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
+static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR(200);
 
 #ifdef _XBT_WIN32
 # undef _XBT_NEED_INIT_PRAGMA
@@ -114,39 +83,6 @@ static void xbt_preinit(void)
 #endif
   xbt_log_preinit();
 
-  /* 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, xbt);
-  XBT_LOG_CONNECT(xbt_dict_cursor, xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_elm, xbt_dict);
-#ifdef XBT_USE_DEPRECATED
-  XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
-#endif
-  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_parmap,xbt);
-  XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
-  XBT_LOG_CONNECT(xbt_ddt, xbt);
-  XBT_LOG_CONNECT(xbt_ddt_cbps, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_convert, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_create, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_exchange, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse);
-  XBT_LOG_CONNECT(xbt_ddt_parse, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_trp, xbt);
-  XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp);
-
   xbt_backtrace_preinit();
   xbt_os_thread_mod_preinit();
   xbt_fifo_preinit();