kill an unused variable, fix a segfault after resizing the buffer while varsubsting...

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

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index 1db0029..4cdb299 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -17,32 +17,49 @@ XBT_LOG_NEW_SUBCATEGORY(xbt_dict_search,xbt_dict,"Dictionaries internals: search
 XBT_LOG_NEW_SUBCATEGORY(xbt_dict_remove,xbt_dict,"Dictionaries internals: elements removal");
 XBT_LOG_NEW_SUBCATEGORY(xbt_dict_collapse,xbt_dict,"Dictionaries internals: post-removal cleanup");
 
+xbt_mallocator_t dict_elm_mallocator = NULL;
+
 xbt_dictelm_t xbt_dictelm_new(const char *key,
-                             int key_len,
-                             void *content,
-                             void_f_pvoid_t free_f,
-                             xbt_dictelm_t next) {
-  xbt_dictelm_t element = xbt_new0(s_xbt_dictelm_t, 1);
-  
-  element->key = xbt_new0(char, key_len + 1);
+                              int key_len,
+                              unsigned int hash_code,
+                              void *content,
+                              void_f_pvoid_t free_f) {
+  xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator);
+
+  element->key = xbt_new(char, key_len + 1);
   strncpy(element->key, key, key_len);
+  element->key[key_len] = '\0';
 
   element->key_len = key_len;
+  element->hash_code = hash_code;
+
   element->content = content;
   element->free_f = free_f;
-  element->next = next;
-  
+  element->next = NULL;
+
   return element;
 }
 
 void xbt_dictelm_free(xbt_dictelm_t element) {
   if (element != NULL) {
     xbt_free(element->key);
-    
+
     if (element->free_f != NULL && element->content != NULL) {
       element->free_f(element->content);
     }
-   
-    xbt_free(element);
+
+    xbt_mallocator_release(dict_elm_mallocator, element);
   }
 }
+
+void* dict_elm_mallocator_new_f(void) {
+  return xbt_new(s_xbt_dictelm_t, 1);
+}
+
+void dict_elm_mallocator_free_f(void* elem) {
+  xbt_free(elem);
+}
+
+void dict_elm_mallocator_reset_f(void* elem) {
+
+}