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
Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
src
/
xbt
/
lib.c
diff --git
a/src/xbt/lib.c
b/src/xbt/lib.c
index
a76ca15
..
9929a07
100644
(file)
--- a/
src/xbt/lib.c
+++ b/
src/xbt/lib.c
@@
-71,7
+71,7
@@
void xbt_lib_set(xbt_lib_t lib, const char *key, int level, void *obj)
}
/* for vm */
}
/* for vm */
-void xbt_lib_unset(xbt_lib_t lib, const char *key, int level)
+void xbt_lib_unset(xbt_lib_t lib, const char *key, int level
, int invoke_callback
)
{
void **elts = xbt_dict_get_or_null(lib->dict, key);
if (!elts) {
{
void **elts = xbt_dict_get_or_null(lib->dict, key);
if (!elts) {
@@
-83,14
+83,14
@@
void xbt_lib_unset(xbt_lib_t lib, const char *key, int level)
if (!obj) {
XBT_WARN("no key %s at level %d", key, level);
if (!obj) {
XBT_WARN("no key %s at level %d", key, level);
- return;
} else {
XBT_DEBUG("Remove %p of key %s at level %d", obj, key, level);
} else {
XBT_DEBUG("Remove %p of key %s at level %d", obj, key, level);
- lib->free_f[level](obj);
+ if (invoke_callback)
+ lib->free_f[level](obj);
elts[level] = NULL;
}
elts[level] = NULL;
}
- /* check if there
are
elements of this key */
+ /* check if there
still remains any
elements of this key */
int i;
for (i = 0; i < lib->levels; i++) {
if (elts[i] != NULL)
int i;
for (i = 0; i < lib->levels; i++) {
if (elts[i] != NULL)