X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/682eb8ce658cd1cafc772d2f62b6fb9430471b81..d177472fea36c2a8f780637477591025663d30a4:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 4d3c1d6604..54c9ac61a6 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -47,7 +47,7 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_set);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os);
 
 /** @brief Initialize the xbt mechanisms. */
-void 
+void
 xbt_init(int *argc, char **argv) {
   xbt_initialized++;
 
@@ -62,13 +62,13 @@ 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_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,11 +77,11 @@ 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_binary_name = xbt_strdup(argv[0]);
   srand((unsigned int)time(NULL));
   VERB0("Initialize XBT");
-  
+
   xbt_backtrace_init();
   xbt_log_init(argc,argv);
   xbt_os_thread_mod_init();
@@ -89,7 +89,7 @@ xbt_init(int *argc, char **argv) {
 }
 
 /** @brief Finalize the xbt mechanisms. */
-void 
+void
 xbt_exit(){
   xbt_initialized--;
   if (xbt_initialized == 0) {
@@ -99,9 +99,19 @@ xbt_exit(){
     xbt_os_thread_mod_exit();
     xbt_log_exit();
     xbt_backtrace_exit();
-  }
-   
-  if (xbt_initialized == 0)
     free(xbt_binary_name);
+  }
+}
+
+
+/* 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) {
+  free(p);
+}
+
+/** @brief should be given a pointer to pointer, and frees the second one */
+XBT_PUBLIC(void) xbt_free_ref(void *d){
+  free(*(void**)d);
 }