X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index a533533a0c..db5e33e61d 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -1,12 +1,13 @@
-/* $Id$ */
-
 /* module handling                                                          */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "xbt/misc.h"
+#include "simgrid_config.h"     /*HAVE_MMAP _XBT_WIN32 */
 #include "time.h"               /* to seed the random generator */
 
 #include "xbt/sysdep.h"
@@ -30,13 +31,9 @@ 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_add);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_collapse);
 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_dict_remove);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_search);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_ex);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo);
@@ -45,14 +42,56 @@ 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);
 
-/** @brief Initialize the xbt mechanisms. */
-void xbt_init(int *argc, char **argv)
+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.
+ * This is crude and rather compiler-specific, unfortunately.
+ */
+static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR;
+static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR;
+
+#ifdef _XBT_WIN32
+# undef _XBT_NEED_INIT_PRAGMA
+#endif
+
+#ifdef _XBT_NEED_INIT_PRAGMA
+#pragma init (xbt_preinit)
+#pragma fini (xbt_postexit)
+#endif
+
+#ifdef _XBT_WIN32
+#include <windows.h>
+
+/* Dummy prototype to make gcc happy */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
+                    LPVOID lpvReserved);
+
+
+/* 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)
 {
-  xbt_initialized++;
+  if (fdwReason == DLL_PROCESS_ATTACH) {
+    xbt_preinit();
+  } else if (fdwReason == DLL_PROCESS_DETACH) {
+    xbt_postexit();
+  }
+  return 1;
+}
 
-  if (xbt_initialized != 1)
-    return;
+
+#endif
+
+static void xbt_preinit(void)
+{
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+  mmalloc_preinit();
+#endif
+  xbt_log_preinit();
 
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(graphxml_parse, xbt);
@@ -62,13 +101,9 @@ void xbt_init(int *argc, char **argv)
   XBT_LOG_CONNECT(strbuff, xbt);
   XBT_LOG_CONNECT(xbt_cfg, xbt);
   XBT_LOG_CONNECT(xbt_dict, xbt);
-  XBT_LOG_CONNECT(xbt_dict_add, xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_collapse, xbt_dict);
   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_dict_remove, xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_search, xbt_dict);
   XBT_LOG_CONNECT(xbt_dyn, xbt);
   XBT_LOG_CONNECT(xbt_ex, xbt);
   XBT_LOG_CONNECT(xbt_fifo, xbt);
@@ -77,30 +112,52 @@ void xbt_init(int *argc, char **argv)
   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_backtrace_preinit();
+  xbt_os_thread_mod_preinit();
+  xbt_fifo_preinit();
+  xbt_dict_preinit();
+}
+
+static void xbt_postexit(void)
+{
+  xbt_backtrace_postexit();
+
+  xbt_fifo_postexit();
+  xbt_dict_postexit();
+
+  xbt_log_postexit();
+  xbt_os_thread_mod_postexit();
+
+  free(xbt_binary_name);
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+  mmalloc_postexit();
+#endif
+}
+
+/** @brief Initialize the xbt mechanisms. */
+void xbt_init(int *argc, char **argv)
+{
+  // FIXME it would be nice to assert that this function is called only once. But each gras process do call it...
+  xbt_initialized++;
+
+  if (xbt_initialized > 1)
+    return;
 
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int) time(NULL));
-  VERB0("Initialize XBT");
+  XBT_VERB("Initialize XBT");
 
-  xbt_backtrace_init();
   xbt_log_init(argc, argv);
-  xbt_os_thread_mod_init();
-  xbt_context_mod_init();
 }
 
 /** @brief Finalize the xbt mechanisms. */
 void xbt_exit()
 {
-  xbt_initialized--;
-  if (xbt_initialized == 0) {
-    xbt_fifo_exit();
-    xbt_dict_exit();
-    xbt_context_mod_exit();
-    xbt_os_thread_mod_exit();
-    xbt_log_exit();
-    xbt_backtrace_exit();
-    free(xbt_binary_name);
-  }
+  XBT_WARN("This function is deprecated, you shouldn't use it");
 }