X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1502e5c1de6e2f416c505875c2df7dea6b585c48..3318d4f4f09b51bc1158737c5cb0391df264d018:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index f443f17e6c..e1410b334e 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -36,7 +36,8 @@ xbt_init(int *argc, char **argv) {
   VERB0("Initialize XBT");
   
   xbt_log_init(argc,argv);
-  xbt_thread_mod_init();
+  xbt_os_thread_mod_init();
+  xbt_context_init();
 }
 
 /** @brief Finalize the xbt mechanisms. */
@@ -44,11 +45,14 @@ void
 xbt_exit(){
   xbt_initialized--;
   if (xbt_initialized == 0) {
-    free(xbt_binary_name);
     xbt_fifo_exit();
     xbt_dict_exit();
-    xbt_thread_mod_exit();
+    xbt_context_exit();
+    xbt_os_thread_mod_exit();
+    xbt_log_exit();
   }
-  xbt_log_exit();
+   
+  if (xbt_initialized == 0)
+    free(xbt_binary_name);
 }