Move all XBT_LOG_CONNECT into one place.

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index dc985ad..44ca9d5 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -213,7 +213,6 @@ xbt_dict_t gras_os_host_properties(void)
 
 void gras_global_init(int *argc, char **argv)
 {
-  XBT_LOG_CONNECT(gras_trp_sg, gras_trp);
   SIMIX_global_init(argc, argv);
 }
 

diff --git a/src/gras/gras.c b/src/gras/gras.c
index b0a652d..9267a50 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -73,19 +73,6 @@ void gras_init(int *argc, char **argv)
    */
   if (gras_running_process == 0) {
     first = 1;
-    /* Connect our log channels: that must be done manually under windows */
-
-    XBT_LOG_CONNECT(gras_modules, gras);
-
-    XBT_LOG_CONNECT(gras_msg, gras);
-    XBT_LOG_CONNECT(gras_msg_read, gras_msg);
-    XBT_LOG_CONNECT(gras_msg_rpc, gras_msg);
-
-    XBT_LOG_CONNECT(gras_timer, gras);
-
-    XBT_LOG_CONNECT(gras_virtu, gras);
-    XBT_LOG_CONNECT(gras_virtu_emul, gras_virtu);
-    XBT_LOG_CONNECT(gras_virtu_process, gras_virtu);
 
     if (!getenv("GRAS_NO_WARN_EXPERIMENTAL"))
       XBT_WARN("GRAS is not well maintained anymore. We consider it to be experimental (and not stable anymore) since SimGrid 3.6. Sorry about it, please consider contributing to improve this situation");

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index fd6c9bc..e5c51c6 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -120,8 +120,6 @@ void jedule_sd_cleanup() {
 
 void jedule_sd_init() {
 
-       XBT_LOG_CONNECT(jed_sd, jedule);
-
        jedule_init_output();
 }
 

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 5ea9fa1..a8a9bb4 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -38,12 +38,6 @@ void MSG_global_init(int *argc, char **argv)
 
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
-    /* Connect our log channels: that must be done manually under windows */
-    XBT_LOG_CONNECT(msg_gos, msg);
-    XBT_LOG_CONNECT(msg_kernel, msg);
-    XBT_LOG_CONNECT(msg_mailbox, msg);
-    XBT_LOG_CONNECT(msg_process, msg);
-
     SIMIX_global_init(argc, argv);
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 3334936..31ad28e 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -50,12 +50,6 @@ void SD_init(int *argc, char **argv)
 
   xbt_assert(sd_global == NULL, "SD_init() already called");
 
-  /* Connect our log channels: that must be done manually under windows */
-  XBT_LOG_CONNECT(sd_kernel, sd);
-  XBT_LOG_CONNECT(sd_task, sd);
-  XBT_LOG_CONNECT(sd_workstation, sd);
-
-
   sd_global = xbt_new(s_SD_global_t, 1);
   sd_global->workstation_list = NULL;
   sd_global->link_list = NULL;

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 6511464..c18f9ec 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -58,15 +58,6 @@ void SIMIX_global_init(int *argc, char **argv)
   s_smx_process_t proc;
 
   if (!simix_global) {
-    /* Connect our log channels: that must be done manually under windows */
-    XBT_LOG_CONNECT(simix_context, simix);
-    XBT_LOG_CONNECT(simix_deployment, simix);
-    XBT_LOG_CONNECT(simix_environment, simix);
-    XBT_LOG_CONNECT(simix_host, simix);
-    XBT_LOG_CONNECT(simix_kernel, simix);
-    XBT_LOG_CONNECT(simix_process, simix);
-    XBT_LOG_CONNECT(simix_synchro, simix);
-
     simix_global = xbt_new0(s_smx_global_t, 1);
 
     simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);

diff --git a/src/surf/surf.c b/src/surf/surf.c
index dba895c..2ed4e24 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -317,24 +317,6 @@ void surf_init(int *argc, char **argv)
   SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
   SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
 
-  /* Connect our log channels: that must be done manually under windows */
-  XBT_LOG_CONNECT(surf_config, surf);
-  XBT_LOG_CONNECT(surf_cpu, surf);
-  XBT_LOG_CONNECT(surf_kernel, surf);
-
-  XBT_LOG_CONNECT(surf_lagrange, surf);
-  XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
-
-  XBT_LOG_CONNECT(surf_maxmin, surf);
-  XBT_LOG_CONNECT(surf_network, surf);
-#ifdef HAVE_GTNETS
-  XBT_LOG_CONNECT(surf_network_gtnets, surf);
-#endif
-  XBT_LOG_CONNECT(surf_parse, surf);
-  XBT_LOG_CONNECT(surf_route, surf);
-  XBT_LOG_CONNECT(surf_trace, surf);
-  XBT_LOG_CONNECT(surf_workstation, surf);
-
   xbt_init(argc, argv);
   if (!model_list)
     model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);

diff --git a/src/xbt/log.c b/src/xbt/log.c
index eb24a16..5c7aba2 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -535,6 +535,104 @@ void xbt_log_preinit(void)
   log_cat_init_mutex = xbt_os_rmutex_init();
 }
 
+static void xbt_log_connect_categories(void)
+{
+  /* Connect our log channels: that must be done manually under windows */
+  /* Also permit that they are correctly listed by xbt_log_help_categories() */
+
+  /* gras */
+  XBT_LOG_CONNECT(gras_modules, gras);
+  XBT_LOG_CONNECT(gras_msg, gras);
+  XBT_LOG_CONNECT(gras_msg_read, gras_msg);
+  XBT_LOG_CONNECT(gras_msg_rpc, gras_msg);
+  XBT_LOG_CONNECT(gras_timer, gras);
+  XBT_LOG_CONNECT(gras_virtu, gras);
+  XBT_LOG_CONNECT(gras_virtu_emul, gras_virtu);
+  XBT_LOG_CONNECT(gras_virtu_process, gras_virtu);
+
+  /* xbt */
+  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_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_parse, xbt_ddt);
+  XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse);
+  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_parmap, xbt);
+  XBT_LOG_CONNECT(xbt_parmap_unit, xbt_parmap);
+  XBT_LOG_CONNECT(xbt_queue, xbt);
+  XBT_LOG_CONNECT(xbt_set, xbt);
+  XBT_LOG_CONNECT(xbt_sync_os, xbt);
+  XBT_LOG_CONNECT(xbt_trp, xbt);
+  XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp);
+
+#ifdef simgrid_EXPORTS
+  /* The following categories are only defined in libsimgrid */
+
+  /* gras (sg) */
+  XBT_LOG_CONNECT(gras_trp_sg, gras_trp);
+
+  /* jedule */
+#ifdef HAVE_JEDULE
+  XBT_LOG_CONNECT(jed_sd, jedule);
+#endif
+
+  /* msg */
+  XBT_LOG_CONNECT(msg_gos, msg);
+  XBT_LOG_CONNECT(msg_kernel, msg);
+  XBT_LOG_CONNECT(msg_mailbox, msg);
+  XBT_LOG_CONNECT(msg_process, msg);
+
+  /* sd */
+  XBT_LOG_CONNECT(sd_kernel, sd);
+  XBT_LOG_CONNECT(sd_task, sd);
+  XBT_LOG_CONNECT(sd_workstation, sd);
+
+  /* simix */
+  XBT_LOG_CONNECT(simix_context, simix);
+  XBT_LOG_CONNECT(simix_deployment, simix);
+  XBT_LOG_CONNECT(simix_environment, simix);
+  XBT_LOG_CONNECT(simix_host, simix);
+  XBT_LOG_CONNECT(simix_kernel, simix);
+  XBT_LOG_CONNECT(simix_process, simix);
+  XBT_LOG_CONNECT(simix_synchro, simix);
+
+  /* surf */
+  XBT_LOG_CONNECT(surf_config, surf);
+  XBT_LOG_CONNECT(surf_cpu, surf);
+  XBT_LOG_CONNECT(surf_kernel, surf);
+  XBT_LOG_CONNECT(surf_lagrange, surf);
+  XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
+  XBT_LOG_CONNECT(surf_maxmin, surf);
+  XBT_LOG_CONNECT(surf_network, surf);
+#ifdef HAVE_GTNETS
+  XBT_LOG_CONNECT(surf_network_gtnets, surf);
+#endif
+  XBT_LOG_CONNECT(surf_parse, surf);
+  XBT_LOG_CONNECT(surf_route, surf);
+  XBT_LOG_CONNECT(surf_trace, surf);
+  XBT_LOG_CONNECT(surf_workstation, surf);
+
+#endif /* simgrid_EXPORTS */
+}
+
 /** @brief Get all logging settings from the command line
  *
  * xbt_log_control_set() is called on each string we got from cmd line
@@ -572,6 +670,8 @@ void xbt_log_init(int *argc, char **argv)
     argv[j] = NULL;
     *argc = j;
   }
+
+  xbt_log_connect_categories();
 }
 
 static void log_cat_exit(xbt_log_category_t cat)

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index af6d6a1..72c629b 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -82,45 +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);
-#ifdef XBT_USE_DEPRECATED
-  XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
-#endif
-
-  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_parse, xbt_ddt);
-  XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse);
-
-  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_parmap, xbt);
-  XBT_LOG_CONNECT(xbt_parmap_unit, xbt_parmap);
-
-  XBT_LOG_CONNECT(xbt_queue, xbt);
-  XBT_LOG_CONNECT(xbt_set, xbt);
-  XBT_LOG_CONNECT(xbt_sync_os, xbt);
-
-  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();