Cosmetics: sort calls to XBT_LOG_CONNECT.

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 7f0f9ed..6511464 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -59,13 +59,13 @@ void SIMIX_global_init(int *argc, char **argv)
 
   if (!simix_global) {
     /* Connect our log channels: that must be done manually under windows */
 
   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);
     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);

-    XBT_LOG_CONNECT(simix_context, simix);

 
     simix_global = xbt_new0(s_smx_global_t, 1);
 
 
     simix_global = xbt_new0(s_smx_global_t, 1);
 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 03f58d5..dba895c 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -318,21 +318,22 @@ void surf_init(int *argc, char **argv)
   SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
 
   /* Connect our log channels: that must be done manually under windows */
   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_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_lagrange, surf);
   XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);

+

   XBT_LOG_CONNECT(surf_maxmin, surf);
   XBT_LOG_CONNECT(surf_network, surf);
   XBT_LOG_CONNECT(surf_maxmin, surf);
   XBT_LOG_CONNECT(surf_network, surf);

-  XBT_LOG_CONNECT(surf_trace, surf);
-  XBT_LOG_CONNECT(surf_parse, surf);
-  XBT_LOG_CONNECT(surf_workstation, surf);
-  XBT_LOG_CONNECT(surf_config, surf);
-  XBT_LOG_CONNECT(surf_route, surf);
-

 #ifdef HAVE_GTNETS
   XBT_LOG_CONNECT(surf_network_gtnets, surf);
 #endif
 #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)
 
   xbt_init(argc, argv);
   if (!model_list)

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 617d687..af6d6a1 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -89,29 +89,35 @@ static void xbt_preinit(void)
   XBT_LOG_CONNECT(peer, xbt);
   XBT_LOG_CONNECT(strbuff, xbt);
   XBT_LOG_CONNECT(xbt_cfg, 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_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_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_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_LOG_CONNECT(xbt_trp, xbt);
   XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp);