X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81b2c8f6358e3f5c0e1d480a45e8d1b574210177..aed08a7a06b25674081adf610f369530e8c1e3bb:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 92765f10c3..e1410b334e 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -31,11 +31,13 @@ xbt_init(int *argc, char **argv) { if (xbt_initialized!=1) return; - xbt_binary_name = strdup(argv[0]); + xbt_binary_name = xbt_strdup(argv[0]); srand((unsigned int)time(NULL)); VERB0("Initialize XBT"); xbt_log_init(argc,argv); + xbt_os_thread_mod_init(); + xbt_context_init(); } /** @brief Finalize the xbt mechanisms. */ @@ -43,10 +45,14 @@ void xbt_exit(){ xbt_initialized--; if (xbt_initialized == 0) { - free(xbt_binary_name); xbt_fifo_exit(); xbt_dict_exit(); + xbt_context_exit(); + xbt_os_thread_mod_exit(); + xbt_log_exit(); } - xbt_log_exit(); + + if (xbt_initialized == 0) + free(xbt_binary_name); }