X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/faf497b1ecc3452e93f71edbab5e766cf0b53f0f..c46c0b0d1e605253fa05ccf16251d1a753b3fec7:/src/xbt/lib.c

diff --git a/src/xbt/lib.c b/src/xbt/lib.c
index a76ca15468..4f9313eced 100644
--- a/src/xbt/lib.c
+++ b/src/xbt/lib.c
@@ -1,6 +1,6 @@
 /* lib - a generic library, variation over dictionary                    */
 
-/* Copyright (c) 2011. The SimGrid Team.
+/* Copyright (c) 2011, 2013-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -17,7 +17,7 @@ xbt_lib_t xbt_lib_new(void)
 {
   xbt_lib_t lib;
   lib = xbt_new(s_xbt_lib_t, 1);
-  lib->dict = xbt_dict_new_homogeneous(xbt_free);
+  lib->dict = xbt_dict_new_homogeneous(xbt_free_f);
   lib->levels = 0;
   lib->free_f = NULL;
   return lib;
@@ -70,8 +70,7 @@ void xbt_lib_set(xbt_lib_t lib, const char *key, int level, void *obj)
   elts[level] = obj;
 }
 
-/* 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) {
@@ -80,25 +79,28 @@ void xbt_lib_unset(xbt_lib_t lib, const char *key, int level)
   }
 
   void *obj = elts[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);
-     lib->free_f[level](obj);
-     elts[level] = NULL;
   }
 
-  /* check if there are elements of this key */
+  XBT_DEBUG("Remove %p of key %s at level %d", obj, key, level);
+  elts[level] = NULL;
+
+  /* check if there still remains any elements of this key */
+  int empty = 1;
   int i;
-  for (i = 0; i < lib->levels; i++) {
+  for (i = 0; i < lib->levels && empty; i++) {
      if (elts[i] != NULL)
-       return;
+       empty = 0;
+  }
+  if (empty) {
+    /* there is no element at any level, so delete the key */
+    xbt_dict_remove(lib->dict, key);
   }
 
-  /* there is no element at any level, so delete the key */
-  xbt_dict_remove(lib->dict, key);
+  if (invoke_callback)
+    lib->free_f[level](obj);
 }
 
 void *xbt_lib_get_or_null(xbt_lib_t lib, const char *key, int level)