X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c605e37c3e74b65b478e6d6aec9534cace344b7..0a03cd809dd45e3645a54feffe364d8f2b33d71e:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 927c613022..123f4df956 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -7,45 +7,110 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "time.h" /* to seed the random generator */
+#include "time.h"               /* to seed the random generator */
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dynar.h"
 #include "xbt/config.h"
 
-#include "xbt/module.h" /* this module */
+#include "xbt/module.h"         /* this module */
 
-#include "xbt_modinter.h"  /* prototype of other module's init/exit in XBT */
+#include "xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module,xbt, "module handling");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
-char *xbt_binary_name=NULL; /* Mandatory to retrieve neat backtraces */
-int xbt_initialized=0;
+char *xbt_binary_name = NULL;   /* Mandatory to retrieve neat backtraces */
+int xbt_initialized = 0;
+
+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 
-xbt_init(int *argc, char **argv) {
+void xbt_init(int *argc, char **argv)
+{
   xbt_initialized++;
 
-  if (xbt_initialized!=1)
+  if (xbt_initialized != 1)
     return;
 
-  xbt_binary_name = strdup(argv[0]);
-  srand((unsigned int)time(NULL));
+  /* 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_log_init(argc,argv);
+
+  xbt_backtrace_init();
+  xbt_log_init(argc, argv);
+  xbt_os_thread_mod_init();
 }
 
 /** @brief Finalize the xbt mechanisms. */
-void 
-xbt_exit(){
+void xbt_exit()
+{
   xbt_initialized--;
   if (xbt_initialized == 0) {
-    free(xbt_binary_name);
     xbt_fifo_exit();
+    xbt_dict_exit();
+    xbt_os_thread_mod_exit();
+    xbt_log_exit();
+    xbt_backtrace_exit();
+    free(xbt_binary_name);
   }
-  xbt_log_exit();
 }
 
+
+/* 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);
+}