/* lib - a generic library, variation over dictionary */
-/* Copyright (c) 2011. The SimGrid Team.
+/* Copyright (c) 2011, 2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
}
/* 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) {
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);
- lib->free_f[level](obj);
+ if (invoke_callback)
+ lib->free_f[level](obj);
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)
}
/* there is no element at any level, so delete the key */
- xbt_dict_remove(lib->dict, key)
+ xbt_dict_remove(lib->dict, key);
}
void *xbt_lib_get_or_null(xbt_lib_t lib, const char *key, int level)