removing MSG_process_start from the documentation

[simgrid.git] / src / xbt / dict_multi.c

diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c
index ddcb5ba..4fa432e 100644 (file)
--- a/src/xbt/dict_multi.c
+++ b/src/xbt/dict_multi.c
@@ -12,8 +12,8 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(dict_multi,dict, "Dictionaries of multiple keys");
 
 static void _free_dict(void*d) {
-  xbt_dict_t dict=*(xbt_dict_t*)d;
-  xbt_dict_free(&dict);
+  VERB1("free dict %p",d);
+  xbt_dict_free((xbt_dict_t*)&d);
 }
 
 /** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
@@ -60,7 +60,8 @@ xbt_multidict_set_ext(xbt_dict_t  mdict,
     /* make sure the dict of next level exists */
     if (errcode == mismatch_error) {
       nextlevel=xbt_dict_new();
-      xbt_dict_set_ext(thislevel, thiskey, thislen, &nextlevel, _free_dict);
+      VERB1("Create a dict (%p)",nextlevel);
+      xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
     }
   }
 
@@ -133,7 +134,8 @@ xbt_multidict_get_ext(xbt_dict_t  mdict,
     xbt_dynar_get_cpy(keys, i, &thiskey);
     xbt_dynar_get_cpy(lens, i, &thislen);
 
-    DEBUG5("multi_get: at level %d, len=%ld, key=%p |%*s|", i, thislen, thiskey, (int)thislen,thiskey);
+    DEBUG6("multi_get: at level %d (%p), len=%ld, key=%p |%*s|", 
+      i, thislevel, thislen, thiskey, (int)thislen,thiskey);
 
     /* search the dict of next level: let mismatch raise if not found */
     TRY(xbt_dict_get_ext(thislevel, thiskey, thislen, (void*)&nextlevel));
@@ -182,15 +184,12 @@ xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
   xbt_dict_t thislevel,nextlevel;
   int i;
 
-  xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
-  xbt_assert0(xbt_dynar_length(keys), "Can't remove a zero-long key set in a multidict");
-
   unsigned long int thislen;
   char *thiskey;
   int keys_len=xbt_dynar_length(keys);
 
   xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
-  xbt_assert0(keys_len, "Can't set a zero-long key set in a multidict");
+  xbt_assert0(xbt_dynar_length(keys), "Can't remove a zero-long key set in a multidict");
 
   for (i=0         , thislevel=mdict      ; 
        i<keys_len-1                       ;