X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56fa1c897b84e3ae4c2849285def19575dd27611..8dc7a3bb3f1aaa0fabb9a2acc22c32483f662bab:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index a51a2abe1f..36e91515a5 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -8,6 +8,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/mallocator.h" @@ -164,15 +165,17 @@ static unsigned int xbt_dict_hash(const char *str) { * Set the \a data in the structure under the \a key, which can be any kind * of data, as long as its length is provided in \a key_len. */ -void xbt_dict_set_ext(xbt_dict_t dict, +void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, - void_f_pvoid_t *free_ctn) { - xbt_assert(dict); + void_f_pvoid_t free_ctn) { - unsigned int hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; + unsigned int hash_code; xbt_dictelm_t current, previous = NULL; + xbt_assert(dict); + + hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; current = dict->table[hash_code]; while (current != NULL && @@ -214,10 +217,10 @@ void xbt_dict_set_ext(xbt_dict_t dict, * set the \a data in the structure under the \a key, which is a * null terminated string. */ -void xbt_dict_set(xbt_dict_t dict, +void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, - void_f_pvoid_t *free_ctn) { + void_f_pvoid_t free_ctn) { xbt_assert(dict); @@ -237,11 +240,15 @@ void xbt_dict_set(xbt_dict_t dict, void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len) { - xbt_assert(dict); - unsigned int hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; + + unsigned int hash_code; xbt_dictelm_t current; + xbt_assert(dict); + + hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; + current = dict->table[hash_code]; while (current != NULL && (key_len != current->key_len || strncmp(key, current->key, key_len))) { @@ -268,11 +275,15 @@ void *xbt_dict_get_ext(xbt_dict_t dict, */ void *xbt_dict_get(xbt_dict_t dict, const char *key) { - xbt_assert(dict); - unsigned int hash_code = xbt_dict_hash(key) % dict->table_size; + + unsigned int hash_code ; xbt_dictelm_t current; + xbt_assert(dict); + + hash_code = xbt_dict_hash(key) % dict->table_size; + current = dict->table[hash_code]; while (current != NULL && (strcmp(key, current->key))) { current = current->next; @@ -316,11 +327,15 @@ void *xbt_dict_get_or_null(xbt_dict_t dict, void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) { - xbt_assert(dict); - unsigned int hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; + + unsigned int hash_code ; xbt_dictelm_t current, previous = NULL; + xbt_assert(dict); + + hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size; + current = dict->table[hash_code]; while (current != NULL && (key_len != current->key_len || strncmp(key, current->key, key_len))) { @@ -364,10 +379,16 @@ void xbt_dict_remove(xbt_dict_t dict, * \param dict the dict */ void xbt_dict_reset(xbt_dict_t dict) { - xbt_assert(dict); + int i; xbt_dictelm_t current, previous = NULL; + + xbt_assert(dict); + + if (dict->count == 0) + return; + for (i = 0; i < dict->table_size; i++) { current = dict->table[i]; while (current != NULL) { @@ -395,9 +416,13 @@ int xbt_dict_length(xbt_dict_t dict) { * Add an already mallocated element to a dictionary. */ void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element) { - xbt_assert(dict); - int hashcode = xbt_dict_hash_ext(element->key,element->key_len) % dict->table_size; + + int hashcode; + + xbt_assert(dict); + + hashcode = xbt_dict_hash_ext(element->key,element->key_len) % dict->table_size; element->next = dict->table[hashcode]; dict->table[hashcode] = element; } @@ -413,7 +438,7 @@ void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element) { */ void xbt_dict_dump(xbt_dict_t dict, - void_f_pvoid_t *output) { + void_f_pvoid_t output) { int i; xbt_dictelm_t element; printf("Dict %p:\n", dict); @@ -423,7 +448,7 @@ void xbt_dict_dump(xbt_dict_t dict, while (element != NULL) { printf("%s -> ", element->key); if (output != NULL) { - output(element->content); + (*output)(element->content); } printf("\n"); element = element->next; @@ -439,7 +464,9 @@ void xbt_dict_dump(xbt_dict_t dict, void xbt_dict_exit(void) { if (dict_mallocator != NULL) { xbt_mallocator_free(dict_mallocator); + dict_mallocator = NULL; xbt_mallocator_free(dict_elm_mallocator); + dict_elm_mallocator = NULL; } } @@ -567,9 +594,21 @@ char *data; XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrieve, traverse"){ - xbt_test_add0("Traversal the empty dictionnary"); + xbt_test_add0("Traversal the null dictionnary"); traverse(head); + xbt_test_add0("Traversal and search the empty dictionnary"); + head = xbt_dict_new(); + traverse(head); + TRY { + debuged_remove(head,"12346"); + } CATCH(e) { + if (e.category != not_found_error) + xbt_test_exception(e); + xbt_ex_free(e); + } + xbt_dict_free(&head); + xbt_test_add0("Traverse the full dictionnary"); fill(&head); count(head, 7); @@ -744,7 +783,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){ for (i=0;i<10;i++) { head=xbt_dict_new(); - // if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); + /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ nb=0; for (j=0;j<1000;j++) { key=xbt_malloc(SIZEOFKEY); @@ -767,7 +806,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){ head=xbt_dict_new(); xbt_test_add1("Fill %d elements, with keys being the number of element",NB_ELM); for (j=0;j