X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c30a24ef37908335f59b60f87083bf3575305953..0a03cd809dd45e3645a54feffe364d8f2b33d71e:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index f116e5aeaa..60937b3155 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,6 @@ /* $Id$ */ -/* dict - a generic dictionnary, variation over the B-tree concept */ +/* dict - a generic dictionary, variation over the B-tree concept */ /* Copyright (c) 2003,2004 Martin Quinson. All rights reserved. */ @@ -18,14 +18,14 @@ #include "xbt_modinter.h" #include "dict_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict,xbt, - "Dictionaries provide the same functionnalities than hash tables"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, + "Dictionaries provide the same functionalities than hash tables"); /*####[ Private prototypes ]#################################################*/ static xbt_mallocator_t dict_mallocator = NULL; -static void* dict_mallocator_new_f(void); -static void dict_mallocator_free_f(void* dict); -static void dict_mallocator_reset_f(void* dict); +static void *dict_mallocator_new_f(void); +static void dict_mallocator_free_f(void *dict); +static void dict_mallocator_reset_f(void *dict); /*####[ Code ]###############################################################*/ @@ -35,9 +35,10 @@ static void dict_mallocator_reset_f(void* dict); * \return pointer to the destination * \see xbt_dict_new_ext(), xbt_dict_free() * - * Creates and initialize a new dictionnary with a default hashtable size. + * Creates and initialize a new dictionary with a default hashtable size. */ -xbt_dict_t xbt_dict_new(void) { +xbt_dict_t xbt_dict_new(void) +{ xbt_dict_t dict; if (dict_mallocator == NULL) { @@ -54,7 +55,7 @@ xbt_dict_t xbt_dict_new(void) { dict = xbt_mallocator_get(dict_mallocator); dict->table_size = 127; - dict->table = xbt_new0(xbt_dictelm_t, dict->table_size+1); + dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1); dict->count = 0; dict->fill = 0; @@ -63,11 +64,12 @@ xbt_dict_t xbt_dict_new(void) { /** * \brief Destructor - * \param dict the dictionnary to be freed + * \param dict the dictionary to be freed * * Frees a dictionary with all the data */ -void xbt_dict_free(xbt_dict_t *dict) { +void xbt_dict_free(xbt_dict_t * dict) +{ int i; xbt_dictelm_t current, previous; int table_size; @@ -78,7 +80,9 @@ void xbt_dict_free(xbt_dict_t *dict) { if (dict != NULL && *dict != NULL) { table_size = (*dict)->table_size; table = (*dict)->table; - for (i = 0; (*dict)->count && i < table_size; i++) { + /* Warning: the size of the table is 'table_size+1'... + * This is because table_size is used as a binary mask in xbt_dict_rehash */ + for (i = 0; (*dict)->count && i <= table_size; i++) { current = table[i]; while (current != NULL) { previous = current; @@ -96,14 +100,16 @@ void xbt_dict_free(xbt_dict_t *dict) { /** * Returns the amount of elements in the dict */ -unsigned int xbt_dict_size(xbt_dict_t dict) { +XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) +{ return dict->count; } /** * Returns the hash code of a string. */ -static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) { +static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) +{ #ifdef DJB2_HASH_FUNCTION @@ -113,19 +119,20 @@ static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) { while (str_len--) { c = *str++; - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ } # elif defined(FNV_HASH_FUNCTION) register unsigned int hash = 0x811c9dc5; - unsigned char *bp = (unsigned char *)str; /* start of buffer */ - unsigned char *be = bp + str_len; /* beyond end of buffer */ + unsigned char *bp = (unsigned char *) str; /* start of buffer */ + unsigned char *be = bp + str_len; /* beyond end of buffer */ while (bp < be) { /* multiply by the 32 bit FNV magic prime mod 2^32 */ - hash += (hash<<1) + (hash<<4) + (hash<<7) + (hash<<8) + (hash<<24); + hash += + (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24); /* xor the bottom with the current octet */ - hash ^= (unsigned int)*bp++; + hash ^= (unsigned int) *bp++; } # else @@ -140,14 +147,15 @@ static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) { return hash; } -static XBT_INLINE unsigned int xbt_dict_hash(const char *str) { +static XBT_INLINE unsigned int xbt_dict_hash(const char *str) +{ #ifdef DJB2_HASH_FUNCTION /* fast implementation of djb2 algorithm */ int c; register unsigned int hash = 5381; - while ( (c = *str++) ) { - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + while ((c = *str++)) { + hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ } # elif defined(FNV_HASH_FUNCTION) @@ -155,10 +163,11 @@ static XBT_INLINE unsigned int xbt_dict_hash(const char *str) { while (*str) { /* multiply by the 32 bit FNV magic prime mod 2^32 */ - hash += (hash<<1) + (hash<<4) + (hash<<7) + (hash<<8) + (hash<<24); + hash += + (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24); - /* xor the bottom with the current octet */ - hash ^= (unsigned int)*str++; + /* xor the bottom with the current byte */ + hash ^= (unsigned int) *str++; } # else @@ -173,7 +182,8 @@ static XBT_INLINE unsigned int xbt_dict_hash(const char *str) { } /* Expend the size of the dict */ -static void xbt_dict_rehash(xbt_dict_t dict) { +static void xbt_dict_rehash(xbt_dict_t dict) +{ const int oldsize = dict->table_size + 1; register int newsize = oldsize * 2; register int i; @@ -182,24 +192,24 @@ static void xbt_dict_rehash(xbt_dict_t dict) { register xbt_dictelm_t bucklet; register xbt_dictelm_t *pprev; - currcell = (xbt_dictelm_t*) xbt_realloc((char*)dict->table, newsize * sizeof(xbt_dictelm_t)); - memset(&currcell[oldsize], 0, oldsize * sizeof(xbt_dictelm_t)); /* zero second half */ + currcell = + (xbt_dictelm_t *) xbt_realloc((char *) dict->table, + newsize * sizeof(xbt_dictelm_t)); + memset(&currcell[oldsize], 0, oldsize * sizeof(xbt_dictelm_t)); /* zero second half */ dict->table_size = --newsize; dict->table = currcell; - DEBUG2("REHASH (%d->%d)",oldsize,newsize); + DEBUG2("REHASH (%d->%d)", oldsize, newsize); - for (i=0; ihash_code & newsize) != i) { /* Move to b */ + each bucklet of this cell must either : + - stay in cell i (ie, currcell) + - go to the cell i+oldsize (ie, twincell) */ + if ((bucklet->hash_code & newsize) != i) { /* Move to b */ *pprev = bucklet->next; bucklet->next = *twincell; if (!*twincell) @@ -212,7 +222,7 @@ static void xbt_dict_rehash(xbt_dict_t dict) { } - if (!*currcell) /* everything moved */ + if (!*currcell) /* everything moved */ dict->fill--; } } @@ -224,24 +234,27 @@ static void xbt_dict_rehash(xbt_dict_t dict) { * \param key_len the size of the \a key * \param data the data to add in the dict * \param free_ctn function to call with (\a key as argument) when - * \a key is removed from the dictionnary + * \a key is removed from the dictionary * * 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. */ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, - void *data, void_f_pvoid_t free_ctn) { + void *data, void_f_pvoid_t free_ctn) +{ - unsigned int hash_code = xbt_dict_hash_ext(key,key_len); + unsigned int hash_code = xbt_dict_hash_ext(key, key_len); xbt_dictelm_t current, previous = NULL; xbt_assert(dict); - DEBUG5("ADD %.*s hash = %d, size = %d, & = %d",key_len,key,hash_code, dict->table_size, hash_code & dict->table_size); + DEBUG5("ADD %.*s hash = %d, size = %d, & = %d", key_len, key, hash_code, + dict->table_size, hash_code & dict->table_size); current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { + (hash_code != current->hash_code || key_len != current->key_len + || memcmp(key, current->key, key_len))) { previous = current; current = current->next; } @@ -258,13 +271,11 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, } else { previous->next = current; } - } - else { + } else { DEBUG6("Replace %.*s by %.*s under key %.*s", - key_len,(char*)current->content, - key_len,(char*)data, - key_len,(char*)key); + key_len, (char *) current->content, + key_len, (char *) data, key_len, (char *) key); /* there is already an element with the same key: overwrite it */ if (current->content != NULL && current->free_f != NULL) { current->free_f(current->content); @@ -281,15 +292,14 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, * \param key the key to set the new data * \param data the data to add in the dict * \param free_ctn function to call with (\a key as argument) when - * \a key is removed from the dictionnary + * \a key is removed from the dictionary * * 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, - const char *key, - void *data, - void_f_pvoid_t free_ctn) { +XBT_INLINE void xbt_dict_set(xbt_dict_t dict, + const char *key, void *data, void_f_pvoid_t free_ctn) +{ xbt_dict_set_ext(dict, key, strlen(key), data, free_ctn); } @@ -304,18 +314,19 @@ void xbt_dict_set(xbt_dict_t dict, * * Search the given \a key. Throws not_found_error when not found. */ -void *xbt_dict_get_ext(xbt_dict_t dict, - const char *key, int key_len) { +XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len) +{ - unsigned int hash_code = xbt_dict_hash_ext(key,key_len); + unsigned int hash_code = xbt_dict_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { + (hash_code != current->hash_code || key_len != current->key_len + || memcmp(key, current->key, key_len))) { current = current->next; } @@ -324,19 +335,21 @@ void *xbt_dict_get_ext(xbt_dict_t dict, return current->content; } + /** * \brief like xbt_dict_get_ext(), but returning NULL when not found */ -void *xbt_dict_get_or_null_ext(xbt_dict_t dict, - const char *key, int key_len) { - unsigned int hash_code = xbt_dict_hash_ext(key,key_len); +void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len) +{ + unsigned int hash_code = xbt_dict_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { + (hash_code != current->hash_code || key_len != current->key_len + || memcmp(key, current->key, key_len))) { current = current->next; } @@ -346,6 +359,28 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, return current->content; } +/** + * @brief retrieve the key associated to that object. Warning, that's a linear search + * + * Returns NULL if the object cannot be found + */ +char *xbt_dict_get_key(xbt_dict_t dict, const void*data) { + int i; + xbt_dictelm_t current; + + + for (i = 0; i <= dict->table_size; i++) { + current = dict->table[i]; + while (current != NULL) { + if (current->content == data) + return current->key; + current = current->next; + } + } + + return NULL; +} + /** * \brief Retrieve data from the dict (null-terminated key) * @@ -357,8 +392,8 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, * Check xbt_dict_get_or_null() for a version returning NULL without exception when * not found. */ -void *xbt_dict_get(xbt_dict_t dict, - const char *key) { +XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key) +{ unsigned int hash_code = xbt_dict_hash(key); xbt_dictelm_t current; @@ -366,7 +401,8 @@ void *xbt_dict_get(xbt_dict_t dict, xbt_assert(dict); current = dict->table[hash_code & dict->table_size]; - while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key))) + while (current != NULL + && (hash_code != current->hash_code || strcmp(key, current->key))) current = current->next; if (current == NULL) @@ -378,8 +414,8 @@ void *xbt_dict_get(xbt_dict_t dict, /** * \brief like xbt_dict_get(), but returning NULL when not found */ -void *xbt_dict_get_or_null(xbt_dict_t dict, - const char *key) { +XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) +{ unsigned int hash_code = xbt_dict_hash(key); xbt_dictelm_t current; @@ -387,7 +423,7 @@ void *xbt_dict_get_or_null(xbt_dict_t dict, current = dict->table[hash_code & dict->table_size]; while (current != NULL && - hash_code != current->hash_code && strcmp(key, current->key)) + hash_code != current->hash_code && strcmp(key, current->key)) current = current->next; if (current == NULL) @@ -406,12 +442,11 @@ void *xbt_dict_get_or_null(xbt_dict_t dict, * * Remove the entry associated with the given \a key (throws not_found) */ -void xbt_dict_remove_ext(xbt_dict_t dict, - const char *key, - int key_len) { +XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) +{ - unsigned int hash_code = xbt_dict_hash_ext(key,key_len); + unsigned int hash_code = xbt_dict_hash_ext(key, key_len); xbt_dictelm_t current, previous = NULL; xbt_assert(dict); @@ -419,8 +454,9 @@ void xbt_dict_remove_ext(xbt_dict_t dict, // fprintf(stderr,"RM %.*s hash = %d, size = %d, & = %d\n",key_len,key,hash_code, dict->table_size, hash_code & dict->table_size); current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || key_len != current->key_len || strncmp(key, current->key, key_len))) { - previous = current; /* save the previous node */ + (hash_code != current->hash_code || key_len != current->key_len + || strncmp(key, current->key, key_len))) { + previous = current; /* save the previous node */ current = current->next; } @@ -448,7 +484,8 @@ void xbt_dict_remove_ext(xbt_dict_t dict, * * Remove the entry associated with the given \a key */ -void xbt_dict_remove(xbt_dict_t dict, const char *key) { +XBT_INLINE void xbt_dict_remove(xbt_dict_t dict, const char *key) +{ xbt_dict_remove_ext(dict, key, strlen(key)); } @@ -456,7 +493,8 @@ void xbt_dict_remove(xbt_dict_t dict, const char *key) { * \brief Remove all data from the dict * \param dict the dict */ -void xbt_dict_reset(xbt_dict_t dict) { +void xbt_dict_reset(xbt_dict_t dict) +{ int i; xbt_dictelm_t current, previous = NULL; @@ -484,24 +522,32 @@ void xbt_dict_reset(xbt_dict_t dict) { * \brief Return the number of elements in the dict. * \param dict a dictionary */ -int xbt_dict_length(xbt_dict_t dict) { +XBT_INLINE int xbt_dict_length(xbt_dict_t dict) +{ xbt_assert(dict); return dict->count; } +/** @brief function to be used in xbt_dict_dump as long as the stored values are strings */ +void xbt_dict_dump_output_string(void *s) +{ + fputs(s, stdout); +} + + /** - * \brief Outputs the content of the structure (debuging purpose) + * \brief Outputs the content of the structure (debugging purpose) * * \param dict the exibitionist - * \param output a function to dump each data in the tree + * \param output a function to dump each data in the tree (check @ref xbt_dict_dump_output_string) * - * Ouputs the content of the structure. (for debuging purpose). \a ouput is a + * Outputs the content of the structure. (for debugging purpose). \a output is a * function to output the data. If NULL, data won't be displayed. */ -void xbt_dict_dump(xbt_dict_t dict, - void_f_pvoid_t output) { +void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output) +{ int i; xbt_dictelm_t element; printf("Dict %p:\n", dict); @@ -511,11 +557,11 @@ void xbt_dict_dump(xbt_dict_t dict, if (element) { printf("[\n"); while (element != NULL) { - printf(" %s -> ", element->key); + printf(" %s -> '", element->key); if (output != NULL) { - (*output)(element->content); + (*output) (element->content); } - printf("\n"); + printf("'\n"); element = element->next; } printf("]\n"); @@ -528,56 +574,58 @@ void xbt_dict_dump(xbt_dict_t dict, xbt_dynar_t all_sizes = NULL; /** @brief shows some debugging info about the bucklet repartition */ -void xbt_dict_dump_sizes(xbt_dict_t dict) { +void xbt_dict_dump_sizes(xbt_dict_t dict) +{ int i; unsigned int count; unsigned int size; xbt_dictelm_t element; - xbt_dynar_t sizes = xbt_dynar_new(sizeof(int),NULL); + xbt_dynar_t sizes = xbt_dynar_new(sizeof(int), NULL); - printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, dict->fill,dict->table_size); + printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, + dict->fill, dict->table_size); if (dict != NULL) { for (i = 0; i < dict->table_size; i++) { element = dict->table[i]; size = 0; if (element) { while (element != NULL) { - size ++; + size++; element = element->next; } } if (xbt_dynar_length(sizes) <= size) { int prevsize = 1; - xbt_dynar_set(sizes,size,&prevsize); + xbt_dynar_set(sizes, size, &prevsize); } else { int prevsize; - xbt_dynar_get_cpy(sizes,size,&prevsize); + xbt_dynar_get_cpy(sizes, size, &prevsize); prevsize++; - xbt_dynar_set(sizes,size,&prevsize); + xbt_dynar_set(sizes, size, &prevsize); } } if (!all_sizes) all_sizes = xbt_dynar_new(sizeof(int), NULL); - xbt_dynar_foreach(sizes,count,size) { + xbt_dynar_foreach(sizes, count, size) { /* Copy values of this one into all_sizes */ int prevcount; if (xbt_dynar_length(all_sizes) <= count) { prevcount = size; - xbt_dynar_set(all_sizes,count,&prevcount); + xbt_dynar_set(all_sizes, count, &prevcount); } else { - xbt_dynar_get_cpy(all_sizes,count,&prevcount); + xbt_dynar_get_cpy(all_sizes, count, &prevcount); prevcount += size; - xbt_dynar_set(all_sizes,count,&prevcount); + xbt_dynar_set(all_sizes, count, &prevcount); } /* Report current sizes */ - if (count==0) + if (count == 0) continue; - if (size==0) + if (size == 0) continue; - printf("%delm x %u cells; ",count,size); + printf("%delm x %u cells; ", count, size); } } printf("\n"); @@ -588,7 +636,8 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) { * Destroy the dict mallocators. * This is an internal XBT function called by xbt_exit(). */ -void xbt_dict_exit(void) { +void xbt_dict_exit(void) +{ if (dict_mallocator != NULL) { xbt_mallocator_free(dict_mallocator); dict_mallocator = NULL; @@ -601,28 +650,31 @@ void xbt_dict_exit(void) { double avg = 0; int total_count = 0; printf("Overall stats:"); - xbt_dynar_foreach(all_sizes,count,size) { - if (count==0) + xbt_dynar_foreach(all_sizes, count, size) { + if (count == 0) continue; - if (size==0) + if (size == 0) continue; - printf("%delm x %d cells; ",count,size); + printf("%delm x %d cells; ", count, size); avg += count * size; total_count += size; } - printf("; %f elm per cell\n",avg/(double)total_count); + printf("; %f elm per cell\n", avg / (double) total_count); } } -static void* dict_mallocator_new_f(void) { +static void *dict_mallocator_new_f(void) +{ return xbt_new(s_xbt_dict_t, 1); } -static void dict_mallocator_free_f(void* dict) { +static void dict_mallocator_free_f(void *dict) +{ xbt_free(dict); } -static void dict_mallocator_reset_f(void* dict) { +static void dict_mallocator_reset_f(void *dict) +{ /* nothing to do because all fields are * initialized in xbt_dict_new */ @@ -636,103 +688,121 @@ static void dict_mallocator_reset_f(void* dict) { XBT_LOG_EXTERNAL_CATEGORY(xbt_dict); XBT_LOG_DEFAULT_CATEGORY(xbt_dict); -XBT_TEST_SUITE("dict","Dict data container"); +XBT_TEST_SUITE("dict", "Dict data container"); -static void print_str(void *str) { - printf("%s",(char*)PRINTF_STR(str)); +static void print_str(void *str) +{ + printf("%s", (char *) PRINTF_STR(str)); } -static void debuged_add_ext(xbt_dict_t head,const char*key,const char*data_to_fill) { - char *data=xbt_strdup(data_to_fill); +static void debuged_add_ext(xbt_dict_t head, const char *key, + const char *data_to_fill) +{ + char *data = xbt_strdup(data_to_fill); - xbt_test_log2("Add %s under %s",PRINTF_STR(data_to_fill),PRINTF_STR(key)); + xbt_test_log2("Add %s under %s", PRINTF_STR(data_to_fill), PRINTF_STR(key)); - xbt_dict_set(head,key,data,&free); - if (XBT_LOG_ISENABLED(xbt_dict,xbt_log_priority_debug)) { - xbt_dict_dump(head,(void (*)(void*))&printf); + xbt_dict_set(head, key, data, &free); + if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) { + xbt_dict_dump(head, (void (*)(void *)) &printf); fflush(stdout); } } -static void debuged_add(xbt_dict_t head,const char*key) { - debuged_add_ext(head,key,key); + +static void debuged_add(xbt_dict_t head, const char *key) +{ + debuged_add_ext(head, key, key); } -static void fill(xbt_dict_t *head) { +static void fill(xbt_dict_t * head) +{ xbt_test_add0("Fill in the dictionnary"); *head = xbt_dict_new(); - debuged_add(*head,"12"); - debuged_add(*head,"12a"); - debuged_add(*head,"12b"); - debuged_add(*head,"123"); - debuged_add(*head,"123456"); + debuged_add(*head, "12"); + debuged_add(*head, "12a"); + debuged_add(*head, "12b"); + debuged_add(*head, "123"); + debuged_add(*head, "123456"); /* Child becomes child of what to add */ - debuged_add(*head,"1234"); + debuged_add(*head, "1234"); /* Need of common ancestor */ - debuged_add(*head,"123457"); + debuged_add(*head, "123457"); } -static void search_ext(xbt_dict_t head,const char*key, const char *data) { +static void search_ext(xbt_dict_t head, const char *key, const char *data) +{ void *found; - xbt_test_add1("Search %s",key); - found=xbt_dict_get(head,key); - xbt_test_log1("Found %s",(char *)found); + xbt_test_add1("Search %s", key); + found = xbt_dict_get(head, key); + xbt_test_log1("Found %s", (char *) found); if (data) - xbt_test_assert1(found,"data do not match expectations: found NULL while searching for %s",data); + xbt_test_assert1(found, + "data do not match expectations: found NULL while searching for %s", + data); if (found) - xbt_test_assert2(!strcmp((char*)data,found),"data do not match expectations: found %s while searching for %s", (char*)found, data); + xbt_test_assert2(!strcmp((char *) data, found), + "data do not match expectations: found %s while searching for %s", + (char *) found, data); } -static void search(xbt_dict_t head,const char*key) { - search_ext(head,key,key); +static void search(xbt_dict_t head, const char *key) +{ + search_ext(head, key, key); } -static void debuged_remove(xbt_dict_t head,const char*key) { +static void debuged_remove(xbt_dict_t head, const char *key) +{ - xbt_test_add1("Remove '%s'",PRINTF_STR(key)); - xbt_dict_remove(head,key); + xbt_test_add1("Remove '%s'", PRINTF_STR(key)); + xbt_dict_remove(head, key); /* xbt_dict_dump(head,(void (*)(void*))&printf); */ } -static void traverse(xbt_dict_t head) { - xbt_dict_cursor_t cursor=NULL; +static void traverse(xbt_dict_t head) +{ + xbt_dict_cursor_t cursor = NULL; char *key; char *data; int i = 0; - xbt_dict_foreach(head,cursor,key,data) { - if (!key || !data || strcmp(key,data)) { - xbt_test_log3("Seen #%d: %s->%s",++i,PRINTF_STR(key),PRINTF_STR(data)); + xbt_dict_foreach(head, cursor, key, data) { + if (!key || !data || strcmp(key, data)) { + xbt_test_log3("Seen #%d: %s->%s", ++i, PRINTF_STR(key), + PRINTF_STR(data)); } else { - xbt_test_log2("Seen #%d: %s",++i,PRINTF_STR(key)); + xbt_test_log2("Seen #%d: %s", ++i, PRINTF_STR(key)); } - xbt_test_assert2(!data || !strcmp(key,data), - "Key(%s) != value(%s). Abording",key,data); + xbt_test_assert2(!data || !strcmp(key, data), + "Key(%s) != value(%s). Aborting", key, data); } } -static void search_not_found(xbt_dict_t head, const char *data) { - int ok=0; +static void search_not_found(xbt_dict_t head, const char *data) +{ + int ok = 0; xbt_ex_t e; - xbt_test_add1("Search %s (expected not to be found)",data); + xbt_test_add1("Search %s (expected not to be found)", data); TRY { data = xbt_dict_get(head, data); - THROW1(unknown_error,0,"Found something which shouldn't be there (%s)",data); + THROW1(unknown_error, 0, "Found something which shouldn't be there (%s)", + data); } CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); - ok=1; + ok = 1; } - xbt_test_assert0(ok,"Exception not raised"); + xbt_test_assert0(ok, "Exception not raised"); } -static void count(xbt_dict_t dict, int length) { +static void count(xbt_dict_t dict, int length) +{ xbt_dict_cursor_t cursor; char *key; void *data; @@ -740,28 +810,58 @@ static void count(xbt_dict_t dict, int length) { xbt_test_add1("Count elements (expecting %d)", length); - xbt_test_assert2(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length); + xbt_test_assert2(xbt_dict_length(dict) == length, + "Announced length(%d) != %d.", xbt_dict_length(dict), + length); - xbt_dict_foreach(dict,cursor,key,data) { + xbt_dict_foreach(dict, cursor, key, data) effective++; + + xbt_test_assert2(effective == length, "Effective length(%d) != %d.", + effective, length); + +} + +static void count_check_get_key(xbt_dict_t dict, int length) +{ + xbt_dict_cursor_t cursor; + char *key,*key2; + void *data; + int effective = 0; + + + xbt_test_add1("Count elements (expecting %d), and test the getkey function", length); + xbt_test_assert2(xbt_dict_length(dict) == length, + "Announced length(%d) != %d.", xbt_dict_length(dict), + length); + + xbt_dict_foreach(dict, cursor, key, data) { + effective++; + key2 = xbt_dict_get_key(dict,data); + xbt_assert2(!strcmp(key,key2), + "The data was registered under %s instead of %s as expected",key2,key); } - xbt_test_assert2(effective == length, "Effective length(%d) != %d.", effective, length); + + xbt_test_assert2(effective == length, "Effective length(%d) != %d.", + effective, length); + } xbt_ex_t e; -xbt_dict_t head=NULL; +xbt_dict_t head = NULL; char *data; -XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrieve, traverse"){ - xbt_test_add0("Traversal the null dictionnary"); +XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse") +{ + xbt_test_add0("Traversal the null dictionary"); traverse(head); - xbt_test_add0("Traversal and search the empty dictionnary"); + xbt_test_add0("Traversal and search the empty dictionary"); head = xbt_dict_new(); traverse(head); TRY { - debuged_remove(head,"12346"); + debuged_remove(head, "12346"); } CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); @@ -769,80 +869,82 @@ XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrieve, traverse") } xbt_dict_free(&head); - xbt_test_add0("Traverse the full dictionnary"); + xbt_test_add0("Traverse the full dictionary"); fill(&head); - count(head, 7); + count_check_get_key(head, 7); - debuged_add_ext(head,"toto","tutu"); - search_ext(head,"toto","tutu"); - debuged_remove(head,"toto"); + debuged_add_ext(head, "toto", "tutu"); + search_ext(head, "toto", "tutu"); + debuged_remove(head, "toto"); - search(head,"12a"); + search(head, "12a"); traverse(head); - xbt_test_add0("Free the dictionnary (twice)"); + xbt_test_add0("Free the dictionary (twice)"); xbt_dict_free(&head); xbt_dict_free(&head); /* CHANGING */ fill(&head); - count(head, 7); + count_check_get_key(head, 7); xbt_test_add0("Change 123 to 'Changed 123'"); - xbt_dict_set(head,"123",strdup("Changed 123"),&free); - count(head, 7); + xbt_dict_set(head, "123", strdup("Changed 123"), &free); + count_check_get_key(head, 7); xbt_test_add0("Change 123 back to '123'"); - xbt_dict_set(head,"123",strdup("123"),&free); - count(head, 7); + xbt_dict_set(head, "123", strdup("123"), &free); + count_check_get_key(head, 7); xbt_test_add0("Change 12a to 'Dummy 12a'"); - xbt_dict_set(head,"12a",strdup("Dummy 12a"),&free); - count(head, 7); + xbt_dict_set(head, "12a", strdup("Dummy 12a"), &free); + count_check_get_key(head, 7); xbt_test_add0("Change 12a to '12a'"); - xbt_dict_set(head,"12a",strdup("12a"),&free); - count(head, 7); + xbt_dict_set(head, "12a", strdup("12a"), &free); + count_check_get_key(head, 7); - xbt_test_add0("Traverse the resulting dictionnary"); + xbt_test_add0("Traverse the resulting dictionary"); traverse(head); /* RETRIEVE */ xbt_test_add0("Search 123"); - data = xbt_dict_get(head,"123"); + data = xbt_dict_get(head, "123"); xbt_test_assert(data); - xbt_test_assert(!strcmp("123",data)); + xbt_test_assert(!strcmp("123", data)); - search_not_found(head,"Can't be found"); - search_not_found(head,"123 Can't be found"); - search_not_found(head,"12345678 NOT"); + search_not_found(head, "Can't be found"); + search_not_found(head, "123 Can't be found"); + search_not_found(head, "12345678 NOT"); - search(head,"12a"); - search(head,"12b"); - search(head,"12"); - search(head,"123456"); - search(head,"1234"); - search(head,"123457"); + search(head, "12a"); + search(head, "12b"); + search(head, "12"); + search(head, "123456"); + search(head, "1234"); + search(head, "123457"); - xbt_test_add0("Traverse the resulting dictionnary"); + xbt_test_add0("Traverse the resulting dictionary"); traverse(head); /* xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add0("Free the dictionnary twice"); + xbt_test_add0("Free the dictionary twice"); xbt_dict_free(&head); xbt_dict_free(&head); - xbt_test_add0("Traverse the resulting dictionnary"); + xbt_test_add0("Traverse the resulting dictionary"); traverse(head); } -XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){ +XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") +{ fill(&head); count(head, 7); xbt_test_add0("Remove non existing data"); TRY { - debuged_remove(head,"Does not exist"); - } CATCH(e) { + debuged_remove(head, "Does not exist"); + } + CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); @@ -851,34 +953,45 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){ xbt_dict_free(&head); - xbt_test_add0("Remove each data manually (traversing the resulting dictionnary each time)"); + xbt_test_add0 + ("Remove each data manually (traversing the resulting dictionary each time)"); fill(&head); - debuged_remove(head,"12a"); traverse(head); + debuged_remove(head, "12a"); + traverse(head); count(head, 6); - debuged_remove(head,"12b"); traverse(head); + debuged_remove(head, "12b"); + traverse(head); count(head, 5); - debuged_remove(head,"12"); traverse(head); + debuged_remove(head, "12"); + traverse(head); count(head, 4); - debuged_remove(head,"123456"); traverse(head); + debuged_remove(head, "123456"); + traverse(head); count(head, 3); TRY { - debuged_remove(head,"12346"); - } CATCH(e) { + debuged_remove(head, "12346"); + } + CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); traverse(head); } - debuged_remove(head,"1234"); traverse(head); - debuged_remove(head,"123457"); traverse(head); - debuged_remove(head,"123"); traverse(head); + debuged_remove(head, "1234"); + traverse(head); + debuged_remove(head, "123457"); + traverse(head); + debuged_remove(head, "123"); + traverse(head); TRY { - debuged_remove(head,"12346"); - } CATCH(e) { + debuged_remove(head, "12346"); + } + CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); - } traverse(head); + } + traverse(head); xbt_test_add0("Free dict, create new fresh one, and then reset the dict"); xbt_dict_free(&head); @@ -887,85 +1000,92 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){ count(head, 0); traverse(head); - xbt_test_add0("Free the dictionnary twice"); + xbt_test_add0("Free the dictionary twice"); xbt_dict_free(&head); xbt_dict_free(&head); } -XBT_TEST_UNIT("nulldata",test_dict_nulldata,"NULL data management"){ +XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") +{ fill(&head); xbt_test_add0("Store NULL under 'null'"); - xbt_dict_set(head,"null",NULL,NULL); - search_ext(head,"null",NULL); + xbt_dict_set(head, "null", NULL, NULL); + search_ext(head, "null", NULL); xbt_test_add0("Check whether I see it while traversing..."); { - xbt_dict_cursor_t cursor=NULL; + xbt_dict_cursor_t cursor = NULL; char *key; - int found=0; + int found = 0; - xbt_dict_foreach(head,cursor,key,data) { - if (!key || !data || strcmp(key,data)) { - xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(data)); + xbt_dict_foreach(head, cursor, key, data) { + if (!key || !data || strcmp(key, data)) { + xbt_test_log2("Seen: %s->%s", PRINTF_STR(key), PRINTF_STR(data)); } else { - xbt_test_log1("Seen: %s",PRINTF_STR(key)); + xbt_test_log1("Seen: %s", PRINTF_STR(key)); } - if (!strcmp(key,"null")) + if (!strcmp(key, "null")) found = 1; } - xbt_test_assert0(found,"the key 'null', associated to NULL is not found"); + xbt_test_assert0(found, + "the key 'null', associated to NULL is not found"); } xbt_dict_free(&head); } #define NB_ELM 20000 #define SIZEOFKEY 1024 -static int countelems(xbt_dict_t head) { +static int countelems(xbt_dict_t head) +{ xbt_dict_cursor_t cursor; char *key; void *data; int res = 0; - xbt_dict_foreach(head,cursor,key,data) { + xbt_dict_foreach(head, cursor, key, data) { res++; } return res; } -XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){ - xbt_dict_t head=NULL; - int i,j,k, nb; +XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") +{ + xbt_dict_t head = NULL; + int i, j, k, nb; char *key; void *data; - srand((unsigned int)time(NULL)); + srand((unsigned int) time(NULL)); - for (i=0;i<10;i++) { - xbt_test_add2("CRASH test number %d (%d to go)",i+1,10-i-1); + for (i = 0; i < 10; i++) { + xbt_test_add2("CRASH test number %d (%d to go)", i + 1, 10 - i - 1); xbt_test_log0("Fill the struct, count its elems and frees the structure"); - xbt_test_log1("using 1000 elements with %d chars long randomized keys.",SIZEOFKEY); - head=xbt_dict_new(); + xbt_test_log1("using 1000 elements with %d chars long randomized keys.", + SIZEOFKEY); + head = xbt_dict_new(); /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ - nb=0; - for (j=0;j<1000;j++) { + nb = 0; + for (j = 0; j < 1000; j++) { char *data = NULL; - key=xbt_malloc(SIZEOFKEY); + key = xbt_malloc(SIZEOFKEY); do { - for (k=0;k0) - printf("Test %d\n",i); - /* else if (i%10) printf("."); else printf("%d",i/10);*/ + VERB1("mdict=%p", mdict); + if (verbose > 0) + printf("Test %d\n", i); + /* else if (i%10) printf("."); else printf("%d",i/10); */ - for (j=0;j0) printf (" Add {"); + for (j = 0; j < NB_ELM; j++) { + if (verbose > 0) + printf(" Add {"); - for (l=0 ; l0) printf("%p=%s %s ",key, key,(l 0) + printf("%p=%s %s ", key, key, (l < DEPTH - 1 ? ";" : "}")); } - if (verbose>0) printf("in multitree %p.\n",mdict); + if (verbose > 0) + printf("in multitree %p.\n", mdict); - xbt_multidict_set(mdict,keys,xbt_strdup(key),free); + xbt_multidict_set(mdict, keys, xbt_strdup(key), free); - data = xbt_multidict_get(mdict,keys); + data = xbt_multidict_get(mdict, keys); - xbt_test_assert2(data && !strcmp((char*)data,key), - "Retrieved value (%s) does not match the entrered one (%s)\n", - (char*)data,key); + xbt_test_assert2(data && !strcmp((char *) data, key), + "Retrieved value (%s) does not match the given one (%s)\n", + (char *) data, key); } xbt_dict_free(&mdict); } @@ -1090,7 +1216,7 @@ XBT_TEST_UNIT("multicrash",test_dict_multicrash,"Multi-dict crash test"){ xbt_dynar_free(&keys); /* if (verbose>0) - xbt_dict_dump(mdict,&xbt_dict_print);*/ + xbt_dict_dump(mdict,&xbt_dict_print); */ xbt_dict_free(&mdict); xbt_dynar_free(&keys);