X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1effe32646f8779309855fbf686fc71f16894d7..06645bbecf0c92a95de41ca840ca549efc0df9e2:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 391b573e90..72c629b052 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -25,36 +25,6 @@ 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);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi);
-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.
@@ -112,37 +82,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);
-  XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
-  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();