Cosmetics: sort calls to XBT_LOG_CONNECT.

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index db5e33e..af6d6a1 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -8,6 +8,7 @@
 
 #include "xbt/misc.h"
 #include "simgrid_config.h"     /*HAVE_MMAP _XBT_WIN32 */
+#include "gras_config.h"        /* MMALLOC_WANT_OVERRIDE_LEGACY */
 #include "time.h"               /* to seed the random generator */
 
 #include "xbt/sysdep.h"
@@ -24,27 +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);
-
 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.
@@ -65,30 +45,39 @@ static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR;
 #ifdef _XBT_WIN32
 #include <windows.h>
 
+#ifndef __GNUC__
 /* Dummy prototype to make gcc happy */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
                     LPVOID lpvReserved);
 
+/* Should not be necessary but for some reason,
+ * DllMain is called twice at attachment and
+ * at detachment.*/
+static int xbt_dll_process_is_attached = 0;
 
 /* see also http://msdn.microsoft.com/en-us/library/ms682583%28VS.85%29.aspx */
 /* and http://www.microsoft.com/whdc/driver/kernel/DLL_bestprac.mspx */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
                     LPVOID lpvReserved)
 {
-  if (fdwReason == DLL_PROCESS_ATTACH) {
-    xbt_preinit();
-  } else if (fdwReason == DLL_PROCESS_DETACH) {
-    xbt_postexit();
+  if (fdwReason == DLL_PROCESS_ATTACH
+                 && xbt_dll_process_is_attached == 0) {
+         xbt_dll_process_is_attached = 1;
+         xbt_preinit();
+  } else if (fdwReason == DLL_PROCESS_DETACH
+                 && xbt_dll_process_is_attached == 1) {
+         xbt_dll_process_is_attached = 0;
+      xbt_postexit();
   }
   return 1;
 }
-
+#endif
 
 #endif
 
 static void xbt_preinit(void)
 {
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
   mmalloc_preinit();
 #endif
   xbt_log_preinit();
@@ -100,30 +89,51 @@ static void xbt_preinit(void)
   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_parmap,xbt);
-  XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
 
+  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();
   xbt_dict_preinit();
+  xbt_datadesc_preinit();
+  xbt_trp_preinit();
 }
 
 static void xbt_postexit(void)
 {
+  xbt_trp_postexit();
+  xbt_datadesc_postexit();
+
   xbt_backtrace_postexit();
 
   xbt_fifo_postexit();
@@ -133,7 +143,7 @@ static void xbt_postexit(void)
   xbt_os_thread_mod_postexit();
 
   free(xbt_binary_name);
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
   mmalloc_postexit();
 #endif
 }
@@ -149,7 +159,6 @@ void xbt_init(int *argc, char **argv)
 
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int) time(NULL));
-  XBT_VERB("Initialize XBT");
 
   xbt_log_init(argc, argv);
 }