A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
f6f079c
..
7ae8e49
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-23,14
+23,6
@@
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;
-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;
-};
-
/** @brief Initialize the xbt mechanisms. */
void
xbt_init(int *argc, char **argv) {
/** @brief Initialize the xbt mechanisms. */
void
xbt_init(int *argc, char **argv) {
@@
-39,7
+31,7
@@
xbt_init(int *argc, char **argv) {
if (xbt_initialized!=1)
return;
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");
srand((unsigned int)time(NULL));
VERB0("Initialize XBT");
@@
-50,8
+42,11
@@
xbt_init(int *argc, char **argv) {
void
xbt_exit(){
xbt_initialized--;
void
xbt_exit(){
xbt_initialized--;
- if (xbt_initialized == 0)
- free(xbt_binary_name);
+ if (xbt_initialized == 0) {
+ free(xbt_binary_name);
+ xbt_fifo_exit();
+ xbt_dict_exit();
+ }
xbt_log_exit();
}
xbt_log_exit();
}