cleanup around the free-like functions used as dealloc callbacks in dynar and dicts...

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index f6f079c..1238139 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -23,13 +23,28 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module,xbt, "module handling");
 char *xbt_binary_name=NULL; /* Mandatory to retrieve neat backtraces */
 int xbt_initialized=0;
 
-struct xbt_module_ {
-  xbt_dynar_t *deps;
-  xbt_cfg_t *cfg;
-  int ref;
-  xbt_module_new_fct_t new;
-  xbt_module_finalize_fct_t finalize;
-};
+XBT_LOG_EXTERNAL_CATEGORY(graphxml_parse);
+XBT_LOG_EXTERNAL_CATEGORY(log);
+XBT_LOG_EXTERNAL_CATEGORY(module);
+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);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_remove);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_search);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ex);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_graph);
+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);
 
 /** @brief Initialize the xbt mechanisms. */
 void 
@@ -39,19 +54,66 @@ xbt_init(int *argc, char **argv) {
   if (xbt_initialized!=1)
     return;
 
-  xbt_binary_name = strdup(argv[0]);
+  /* Connect our log channels: that must be done manually under windows */
+  XBT_LOG_CONNECT(graphxml_parse, xbt);
+  XBT_LOG_CONNECT(log, xbt);
+  XBT_LOG_CONNECT(module, xbt);
+  XBT_LOG_CONNECT(peer, xbt);
+  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_dyn, xbt);
+  XBT_LOG_CONNECT(xbt_ex, xbt);
+  XBT_LOG_CONNECT(xbt_fifo, xbt);
+  XBT_LOG_CONNECT(xbt_graph, xbt);
+  XBT_LOG_CONNECT(xbt_matrix, xbt);
+  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();
+  xbt_context_mod_init();
 }
 
 /** @brief Finalize the xbt mechanisms. */
 void 
 xbt_exit(){
   xbt_initialized--;
+  if (xbt_initialized == 0) {
+    xbt_fifo_exit();
+    xbt_dict_exit();
+    xbt_context_mod_exit();
+    xbt_os_thread_mod_exit();
+    xbt_log_exit();
+    xbt_backtrace_exit();
+  }
+   
   if (xbt_initialized == 0)
-     free(xbt_binary_name);
-  xbt_log_exit();
+    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);
 }