Make dicts ready to accept homogeneous dictionaries.

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index db60d22..a980fc0 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -28,18 +28,25 @@ xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len,
                               unsigned int hash_code, void *content,
                               void_f_pvoid_t free_f)
 {
-  xbt_het_dictelm_t het_element = xbt_mallocator_get(dict_het_elm_mallocator);
-  xbt_dictelm_t element = &het_element->element;
-
+  xbt_dictelm_t element;
+
+  if (dict->homogeneous) {
+    xbt_assert(!free_f,
+               "Cannot set an individual free function in homogeneous dicts.");
+    element = xbt_mallocator_get(dict_elm_mallocator);
+  } else {
+    xbt_het_dictelm_t het_element = xbt_mallocator_get(dict_het_elm_mallocator);
+    het_element->free_f = free_f;
+    element = &het_element->element;
+  }
   element->key = xbt_new(char, key_len + 1);
-  memcpy((void *) element->key, (void *) key, key_len);
+  memcpy(element->key, key, key_len);
   element->key[key_len] = '\0';
 
   element->key_len = key_len;
   element->hash_code = hash_code;
 
   element->content = content;
-  het_element->free_f = free_f;
   element->next = NULL;
 
   return element;
@@ -47,27 +54,43 @@ xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len,
 
 void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element)
 {
-  if (element != NULL) {
-    xbt_het_dictelm_t het_element = (xbt_het_dictelm_t)element;
-    xbt_free(element->key);
-
-    if (het_element->free_f != NULL && element->content != NULL) {
-      het_element->free_f(element->content);
+  if (element) {
+    char *key = element->key;
+    void *content = element->content;
+    void_f_pvoid_t free_f;
+    if (dict->homogeneous) {
+      free_f = dict->free_f;
+      xbt_mallocator_release(dict_elm_mallocator, element);
+    } else {
+      xbt_het_dictelm_t het_element = (xbt_het_dictelm_t)element;
+      free_f = het_element->free_f;
+      xbt_mallocator_release(dict_het_elm_mallocator, het_element);
     }
 
-    xbt_mallocator_release(dict_het_elm_mallocator, het_element);
+    xbt_free(key);
+    if (free_f && content)
+      free_f(content);
   }
 }
 
 void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element,
                           void *data, void_f_pvoid_t free_ctn)
 {
-  xbt_het_dictelm_t het_element = (xbt_het_dictelm_t)element;
-  if (het_element->free_f && element->content)
-    het_element->free_f(element->content);
+  void_f_pvoid_t free_f;
+  if (dict->homogeneous) {
+    free_f = dict->free_f;
+    xbt_assert(!free_ctn,
+               "Cannot set an individual free function in homogeneous dicts.");
+  } else {
+    xbt_het_dictelm_t het_element = (xbt_het_dictelm_t)element;
+    free_f  = het_element->free_f;
+    het_element->free_f = free_ctn;
+  }
+
+  if (free_f && element->content)
+    free_f(element->content);
 
   element->content = data;
-  het_element->free_f = free_ctn;
 }
 
 void *dict_elm_mallocator_new_f(void)