X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f380ed3223bb8c115c1ce7935a00686db166088e..505fa6b336fedfbe5951b01dc5c49f8c3f54e177:/src/xbt/dict_elm.c diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c index 529ea65a66..eb1f890656 100644 --- a/src/xbt/dict_elm.c +++ b/src/xbt/dict_elm.c @@ -17,21 +17,25 @@ 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, + unsigned int hash_code, void *content, - void_f_pvoid_t free_f, - xbt_dictelm_t next) { - xbt_dictelm_t element = xbt_new(s_xbt_dictelm_t, 1); + 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; } @@ -44,6 +48,18 @@ void xbt_dictelm_free(xbt_dictelm_t element) { 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) { + +}