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
This commit concerned the reimplementation of the xbt context switch mechanism.
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
92765f1
..
6023ad0
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-31,11
+31,13
@@
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");
xbt_log_init(argc,argv);
srand((unsigned int)time(NULL));
VERB0("Initialize XBT");
xbt_log_init(argc,argv);
+ xbt_os_thread_mod_init();
+ xbt_context_mod_init();
}
/** @brief Finalize the xbt mechanisms. */
}
/** @brief Finalize the xbt mechanisms. */
@@
-43,10
+45,14
@@
void
xbt_exit(){
xbt_initialized--;
if (xbt_initialized == 0) {
xbt_exit(){
xbt_initialized--;
if (xbt_initialized == 0) {
- free(xbt_binary_name);
xbt_fifo_exit();
xbt_dict_exit();
xbt_fifo_exit();
xbt_dict_exit();
+ xbt_context_mod_exit();
+ xbt_os_thread_mod_exit();
+ xbt_log_exit();
}
}
- xbt_log_exit();
+
+ if (xbt_initialized == 0)
+ free(xbt_binary_name);
}
}