Remove references to undefined log categories.

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index d1b1d16..6c07c33 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"
@@ -33,7 +34,9 @@ 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);
@@ -74,30 +77,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();
@@ -112,7 +124,9 @@ static void xbt_preinit(void)
   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);
@@ -155,7 +169,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
 }
@@ -171,7 +185,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);
 }