Implement reentrant mutexes in xbt_os_thread

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index a3530c3..a6aafc5 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -49,6 +49,7 @@ 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.
  * This is crude and rather compiler-specific, unfortunately.
@@ -122,22 +123,22 @@ static void xbt_preinit(void)
   XBT_LOG_CONNECT(xbt_parmap,xbt);
   XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
 
-  xbt_fifo_preinit();
-  xbt_dict_preinit();
 
   xbt_backtrace_preinit();
   xbt_os_thread_mod_preinit();
+  xbt_fifo_preinit();
+  xbt_dict_preinit();
 }
 
 static void xbt_postexit(void)
 {
-  xbt_os_thread_mod_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
@@ -156,7 +157,7 @@ void xbt_init(int *argc, char **argv)
 
   xbt_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int) time(NULL));
-  VERB0("Initialize XBT");
+  XBT_VERB("Initialize XBT");
 
   xbt_log_init(argc, argv);
 }
@@ -164,7 +165,7 @@ void xbt_init(int *argc, char **argv)
 /** @brief Finalize the xbt mechanisms. */
 void xbt_exit()
 {
-  WARN0("This function is deprecated, you shouldn't use it");
+  XBT_WARN("This function is deprecated, you shouldn't use it");
 }