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
+void
xbt_init(int *argc, char **argv) {
xbt_initialized++;
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_multi, xbt_dict);
XBT_LOG_CONNECT(xbt_dict_remove, xbt_dict);
XBT_LOG_CONNECT(xbt_dict_search, xbt_dict);
- XBT_LOG_CONNECT(xbt_dict, xbt);
XBT_LOG_CONNECT(xbt_dyn, xbt);
XBT_LOG_CONNECT(xbt_ex, xbt);
XBT_LOG_CONNECT(xbt_fifo, xbt);
XBT_LOG_CONNECT(xbt_queue, xbt);
XBT_LOG_CONNECT(xbt_set, xbt);
XBT_LOG_CONNECT(xbt_sync_os, xbt);
- XBT_LOG_CONNECT(xbt_sync_rl, 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();
}
/** @brief Finalize the xbt mechanisms. */
-void
+void
xbt_exit(){
xbt_initialized--;
if (xbt_initialized == 0) {
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);
}