X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd043f62d4d7bf22adb68d5193ec1bb2aaae3c7b..13a86be8f230907c165887f94fc37a63256b7174:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 978302147a..6c07c330f3 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -7,7 +7,8 @@
  * 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 "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"
@@ -31,13 +32,11 @@ 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);
+#ifdef XBT_USE_DEPRECATED
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_remove);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_search);
+#endif
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_ex);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo);
@@ -46,7 +45,19 @@ 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);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_cbps);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_convert);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_create);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_exchange);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_lexer);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_parse);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_trp);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_trp_meas);
+
+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.
@@ -55,7 +66,7 @@ static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR;
 static void xbt_postexit(void) _XBT_GNUC_DESTRUCTOR;
 
 #ifdef _XBT_WIN32
- # undef _XBT_NEED_INIT_PRAGMA
+# undef _XBT_NEED_INIT_PRAGMA
 #endif
 
 #ifdef _XBT_NEED_INIT_PRAGMA
@@ -66,28 +77,41 @@ 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);
+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();
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
+                    LPVOID lpvReserved)
+{
+  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 HAVE_MMAP
-	  mmalloc_preinit();
-	#endif
+static void xbt_preinit(void)
+{
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+  mmalloc_preinit();
+#endif
   xbt_log_preinit();
 
   /* Connect our log channels: that must be done manually under windows */
@@ -98,13 +122,11 @@ static void xbt_preinit(void) {
   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);
+#ifdef XBT_USE_DEPRECATED
   XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_remove, xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_search, xbt_dict);
+#endif
   XBT_LOG_CONNECT(xbt_dyn, xbt);
   XBT_LOG_CONNECT(xbt_ex, xbt);
   XBT_LOG_CONNECT(xbt_fifo, xbt);
@@ -113,25 +135,41 @@ static void xbt_preinit(void) {
   XBT_LOG_CONNECT(xbt_queue, xbt);
   XBT_LOG_CONNECT(xbt_set, xbt);
   XBT_LOG_CONNECT(xbt_sync_os, xbt);
-
-  xbt_fifo_preinit();
-  xbt_dict_preinit();
+  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_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_os_thread_mod_postexit();
+static void xbt_postexit(void)
+{
+  xbt_trp_postexit();
+  xbt_datadesc_postexit();
+
   xbt_backtrace_postexit();
 
   xbt_fifo_postexit();
   xbt_dict_postexit();
 
   xbt_log_postexit();
+  xbt_os_thread_mod_postexit();
 
   free(xbt_binary_name);
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
   mmalloc_postexit();
 #endif
 }
@@ -142,25 +180,26 @@ 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)
+  if (xbt_initialized > 1)
     return;
 
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int) time(NULL));
-  VERB0("Initialize XBT");
 
   xbt_log_init(argc, argv);
 }
 
 /** @brief Finalize the xbt mechanisms. */
-void xbt_exit() {
-  WARN0("This function is deprecated, you shouldn't use it");
+void xbt_exit()
+{
+  XBT_WARN("This function is deprecated, you shouldn't use it");
 }
 
 
 /* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
 /** @brief like free, but you can be sure that it is a function  */
-XBT_PUBLIC(void) xbt_free_f(void *p) {
+XBT_PUBLIC(void) xbt_free_f(void *p)
+{
   free(p);
 }