X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd6274487954af16de90c357090e2d698d886cd1..0d2220ca1c127fc19c249e6e59dec2ac47107854:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index c28171f432..97cfedca84 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -7,15 +7,27 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#define DJB2_HASH_FUNCTION +//#define FNV_HASH_FUNCTION + #include +#include #include "xbt/ex.h" #include "xbt/log.h" +#include "xbt/mallocator.h" +#include "xbt_modinter.h" #include "dict_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict,xbt, "Dictionaries provide the same functionnalities 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); + + /*####[ Code ]###############################################################*/ /** @@ -26,25 +38,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict,xbt, * Creates and initialize a new dictionnary with a default hashtable size. */ xbt_dict_t xbt_dict_new(void) { - return xbt_dict_new_ext(256); -} - -/** - * \brief Create a new dictionary with the specified hashtable size - * \param hashsize the hashtable size - * \return a pointer to the created object - * \see xbt_dict_new(), xbt_dict_free() - */ -xbt_dict_t xbt_dict_new_ext(int hashsize) { - int i; - xbt_dict_t dict = xbt_new0(s_xbt_dict_t, 1); - dict->table_size = hashsize; - dict->table = xbt_new0(xbt_dictelm_t, dict->table_size); - - for (i = 0; i < hashsize; i++) { - dict->table[i] = NULL; + xbt_dict_t dict; + + if (dict_mallocator == NULL) { + /* first run */ + dict_mallocator = xbt_mallocator_new(256, + dict_mallocator_new_f, + dict_mallocator_free_f, + dict_mallocator_reset_f); + dict_elm_mallocator = xbt_mallocator_new(256, + dict_elm_mallocator_new_f, + dict_elm_mallocator_free_f, + dict_elm_mallocator_reset_f); } + + dict = xbt_mallocator_get(dict_mallocator); + dict->table_size = 127; + dict->table = xbt_new0(xbt_dictelm_t, dict->table_size+1); dict->count = 0; + dict->fill = 0; return dict; } @@ -58,65 +70,145 @@ xbt_dict_t xbt_dict_new_ext(int hashsize) { void xbt_dict_free(xbt_dict_t *dict) { int i; xbt_dictelm_t current, previous; + int table_size; + xbt_dictelm_t *table; + +// if ( *dict ) xbt_dict_dump_sizes(*dict); + if (dict != NULL && *dict != NULL) { - for (i = 0; i < (*dict)->table_size; i++) { - current = (*dict)->table[i]; + table_size = (*dict)->table_size; + table = (*dict)->table; + for (i = 0; i < table_size; i++) { + current = table[i]; while (current != NULL) { previous = current; current = current->next; xbt_dictelm_free(previous); } } - xbt_free((*dict)->table); - xbt_free(*dict); + xbt_free(table); + xbt_mallocator_release(dict_mallocator, *dict); *dict = NULL; } } /** - * \brief Change the hashtable size - * \param dict a dictionary - * \param hashsize the new hashtable size - * - * Change the hashtable size is a long operation, so it's better - * to use xbt_dict_new_ext or to call xbt_dict_hashsize_set when - * the dictionary is empty. + * Returns the hash code of a string. */ -void xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize) { - xbt_dict_t new_dict = xbt_dict_new_ext(hashsize); - xbt_dictelm_t element, next; - int i; - - for (i = 0; i < dict->table_size; i++) { - element = dict->table[i]; - while (element != NULL) { - next = element->next; /* save the next because it will be lost */ - xbt_dict_add_element(new_dict, element); /* no new xbt_dictelm_t is mallocated */ - element = next; - } +static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) { + + +#ifdef DJB2_HASH_FUNCTION + /* fast implementation of djb2 algorithm */ + int c; + register unsigned int hash = 5381; + + while (str_len--) { + c = *str++; + 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 */ + + 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); + + /* xor the bottom with the current octet */ + hash ^= (unsigned int)*bp++; } - xbt_free(dict->table); - dict->table = new_dict->table; - dict->table_size = hashsize; - xbt_free(new_dict); +# else + register unsigned int hash = 0; + + while (str_len--) { + hash += (*str) * (*str); + str++; + } +#endif + + return hash; } -/** - * Returns the hash code of a string. - */ -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 */ - unsigned int hash = 5381; int c; + register unsigned int hash = 5381; - while ((c = *str++)) { + while ( (c = *str++) ) { hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ } - + +# elif defined(FNV_HASH_FUNCTION) + register unsigned int hash = 0x811c9dc5; + + while (*str) { + /* multiply by the 32 bit FNV magic prime mod 2^32 */ + hash += (hash<<1) + (hash<<4) + (hash<<7) + (hash<<8) + (hash<<24); + + /* xor the bottom with the current octet */ + hash ^= (unsigned int)*str++; + } + +# else + register unsigned int hash = 0; + + while (*str) { + hash += (*str) * (*str); + str++; + } +#endif return hash; } +/* Expend the size of the 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; + register xbt_dictelm_t *currcell; + register xbt_dictelm_t *twincell; + 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 */ + dict->table_size = --newsize; + dict->table = currcell; + DEBUG2("REHASH (%d->%d)",oldsize,newsize); + + for (i=0; ihash_code & newsize) != i) { /* Move to b */ + *pprev = bucklet->next; + bucklet->next = *twincell; + if (!*twincell) + dict->fill++; + *twincell = bucklet; + continue; + } else { + pprev = &bucklet->next; + } + + } + + if (!*currcell) /* everything moved */ + dict->fill--; + } +} + /** * \brief Add data to the dict (arbitrary key) * \param dict the container @@ -129,36 +221,43 @@ 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, - const char *key, - int key_len, - void *data, - void_f_pvoid_t *free_ctn) { - xbt_assert(dict); +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) { - unsigned int hash_code = xbt_dict_hash(key) % dict->table_size; - xbt_dictelm_t current, previous = NULL; + unsigned int hash_code = xbt_dict_hash_ext(key,key_len); - current = dict->table[hash_code]; + 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); + current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (key_len != current->key_len || strncmp(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; } if (current == NULL) { /* this key doesn't exist yet */ - current = xbt_dictelm_new(key, key_len, data, free_ctn, NULL); + current = xbt_dictelm_new(key, key_len, hash_code, data, free_ctn); + dict->count++; if (previous == NULL) { - dict->table[hash_code] = current; - } - else { + dict->table[hash_code & dict->table_size] = current; + dict->fill++; + if ((dict->fill * 100) / (dict->table_size + 1) > MAX_FILL_PERCENT) + xbt_dict_rehash(dict); + } else { previous->next = current; } - dict->count++; } else { - /* there is already an element with the same key: we overwrite it */ + + DEBUG6("Replace %.*s by %.*s under key %.*s", + 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); } @@ -179,13 +278,11 @@ 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); - xbt_dict_set_ext(dict, key, strlen(key), data, free_ctn); } @@ -199,23 +296,23 @@ 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_assert(dict); +void *xbt_dict_get_ext(xbt_dict_t dict, + const char *key, int key_len) { - unsigned int hash_code = xbt_dict_hash(key) % dict->table_size; + + unsigned int hash_code = xbt_dict_hash_ext(key,key_len); xbt_dictelm_t current; - current = dict->table[hash_code]; + xbt_assert(dict); + + current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (key_len != current->key_len || strncmp(key, current->key, key_len))) { + (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { current = current->next; } - if (current == NULL) { + if (current == NULL) THROW2(not_found_error, 0, "key %.*s not found", key_len, key); - } return current->content; } @@ -233,19 +330,18 @@ 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_dict_hash(key); xbt_dictelm_t current; - current = dict->table[hash_code]; - while (current != NULL && (strcmp(key, current->key))) { + xbt_assert(dict); + + current = dict->table[hash_code & dict->table_size]; + while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key))) current = current->next; - } - if (current == NULL) { + if (current == NULL) THROW1(not_found_error, 0, "key %s not found", key); - } return current->content; } @@ -253,19 +349,22 @@ 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_ex_t e; - void *result = NULL; - TRY { - result = xbt_dict_get(dict, key); - } CATCH(e) { - if (e.category != not_found_error) - RETHROW; - xbt_ex_free(e); - result = NULL; - } - return result; +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; + + xbt_assert(dict); + + current = dict->table[hash_code & dict->table_size]; + while (current != NULL && + hash_code != current->hash_code && strcmp(key, current->key)) + current = current->next; + + if (current == NULL) + return NULL; + + return current->content; } @@ -281,29 +380,32 @@ 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(key) % dict->table_size; + + unsigned int hash_code = xbt_dict_hash_ext(key,key_len); xbt_dictelm_t current, previous = NULL; - current = dict->table[hash_code]; + xbt_assert(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 && - (key_len != current->key_len || strncmp(key, current->key, key_len))) { + (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; } - if (current == NULL) { + if (current == NULL) THROW2(not_found_error, 0, "key %.*s not found", key_len, key); - } if (previous != NULL) { - xbt_assert0(previous->next == current, "previous-next != current"); previous->next = current->next; + } else { + dict->table[hash_code & dict->table_size] = current->next; } - else { - dict->table[hash_code] = current->next; - } + + if (!dict->table[hash_code & dict->table_size]) + dict->fill--; xbt_dictelm_free(current); dict->count--; @@ -317,10 +419,7 @@ 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_assert(dict); - +void xbt_dict_remove(xbt_dict_t dict, const char *key) { xbt_dict_remove_ext(dict, key, strlen(key)); } @@ -329,11 +428,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; - for (i = 0; i < dict->table_size; i++) { + + xbt_assert(dict); + + if (dict->count == 0) + return; + + for (i = 0; i <= dict->table_size; i++) { current = dict->table[i]; while (current != NULL) { previous = current; @@ -344,6 +448,7 @@ void xbt_dict_reset(xbt_dict_t dict) { } dict->count = 0; + dict->fill = 0; } /** @@ -356,17 +461,6 @@ int xbt_dict_length(xbt_dict_t dict) { return dict->count; } -/* - * 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(element->key) % dict->table_size; - element->next = dict->table[hashcode]; - dict->table[hashcode] = element; -} - /** * \brief Outputs the content of the structure (debuging purpose) * @@ -378,25 +472,133 @@ 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); if (dict != NULL) { for (i = 0; i < dict->table_size; i++) { element = dict->table[i]; - while (element != NULL) { - printf("%s -> ", element->key); - if (output != NULL) { - output(element->content); - } - printf("\n"); - element = element->next; + if (element) { + printf("[\n"); + while (element != NULL) { + printf(" %s -> ", element->key); + if (output != NULL) { + (*output)(element->content); + } + printf("\n"); + element = element->next; + } + printf("]\n"); + } else { + printf("[]\n"); } } } } +xbt_dynar_t all_sizes = NULL; +/** @brief shows some debugging info about the bucklet repartition */ +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); + + 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 ++; + element = element->next; + } + } + if (xbt_dynar_length(sizes) <= size) { + int prevsize = 1; + xbt_dynar_set(sizes,size,&prevsize); + } else { + int prevsize; + xbt_dynar_get_cpy(sizes,size,&prevsize); + prevsize++; + xbt_dynar_set(sizes,size,&prevsize); + } + } + if (!all_sizes) + all_sizes = xbt_dynar_new(sizeof(int), NULL); + + 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); + } else { + xbt_dynar_get_cpy(all_sizes,count,&prevcount); + prevcount += size; + xbt_dynar_set(all_sizes,count,&prevcount); + } + + /* Report current sizes */ + if (count==0) + continue; + if (size==0) + continue; + printf("%delm x %u cells; ",count,size); + } + } + printf("\n"); + xbt_dynar_free(&sizes); +} + +/** + * Destroy the dict mallocators. + * This is an internal XBT function called by xbt_exit(). + */ +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; + } + if (all_sizes) { + unsigned int count; + int size; + double avg = 0; + int total_count = 0; + printf("Overall stats:"); + xbt_dynar_foreach(all_sizes,count,size) { + if (count==0) + continue; + if (size==0) + continue; + printf("%delm x %d cells; ",count,size); + avg += count * size; + total_count += size; + } + printf("; %f elm per cell\n",avg/(double)total_count); + } +} + +static void* dict_mallocator_new_f(void) { + return xbt_new(s_xbt_dict_t, 1); +} + +static void dict_mallocator_free_f(void* dict) { + xbt_free(dict); +} + +static void dict_mallocator_reset_f(void* dict) { + /* nothing to do because all fields are + * initialized in xbt_dict_new + */ +} + #ifdef SIMGRID_TEST #include "xbt.h" #include "xbt/ex.h" @@ -411,11 +613,10 @@ static void print_str(void *str) { printf("%s",(char*)PRINTF_STR(str)); } -static void debuged_add(xbt_dict_t head,const char*key) -{ - char *data=xbt_strdup(key); +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_log1("Add %s",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)) { @@ -423,6 +624,9 @@ static void debuged_add(xbt_dict_t head,const char*key) fflush(stdout); } } +static void debuged_add(xbt_dict_t head,const char*key) { + debuged_add_ext(head,key,key); +} static void fill(xbt_dict_t *head) { xbt_test_add0("Fill in the dictionnary"); @@ -439,14 +643,21 @@ static void fill(xbt_dict_t *head) { debuged_add(*head,"123457"); } -static void search(xbt_dict_t head,const char*key) { - void *data; + +static void search_ext(xbt_dict_t head,const char*key, const char *data) { + void *found; xbt_test_add1("Search %s",key); - data=xbt_dict_get(head,key); - xbt_test_log1("Found %s",(char *)data); + found=xbt_dict_get(head,key); + xbt_test_log1("Found %s",(char *)found); if (data) - xbt_test_assert0(!strcmp((char*)data,key),"Key and data do not match"); + 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); +} + +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) { @@ -461,32 +672,51 @@ 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) { - xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(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_assert2(!data || !strcmp(key,data), - "Key(%s) != value(%s). Abording\n",key,data); + "Key(%s) != value(%s). Abording",key,data); } } 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); TRY { - data = xbt_dict_get(head,"Can't be found"); + data = xbt_dict_get(head, 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; } + xbt_test_assert0(ok,"Exception not raised"); } static void count(xbt_dict_t dict, int length) { + xbt_dict_cursor_t cursor; + char *key; + void *data; + int effective = 0; + + xbt_test_add1("Count elements (expecting %d)", length); - xbt_test_assert2(xbt_dict_length(dict) == length, "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) { + effective++; + } + xbt_test_assert2(effective == length, "Effective length(%d) != %d.", effective, length); } xbt_ex_t e; @@ -495,12 +725,28 @@ 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); + + debuged_add_ext(head,"toto","tutu"); + search_ext(head,"toto","tutu"); + debuged_remove(head,"toto"); search(head,"12a"); traverse(head); @@ -605,7 +851,7 @@ XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){ xbt_ex_free(e); } traverse(head); - xbt_test_add0("Remove all values"); + xbt_test_add0("Free dict, create new fresh one, and then reset the dict"); xbt_dict_free(&head); fill(&head); xbt_dict_reset(head); @@ -622,7 +868,7 @@ XBT_TEST_UNIT("nulldata",test_dict_nulldata,"NULL data management"){ xbt_test_add0("Store NULL under 'null'"); xbt_dict_set(head,"null",NULL,NULL); - search(head,"null"); + search_ext(head,"null",NULL); xbt_test_add0("Check whether I see it while traversing..."); { @@ -631,7 +877,12 @@ XBT_TEST_UNIT("nulldata",test_dict_nulldata,"NULL data management"){ int found=0; xbt_dict_foreach(head,cursor,key,data) { - xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(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)); + } + if (!strcmp(key,"null")) found = 1; } @@ -653,7 +904,7 @@ static int countelems(xbt_dict_t head) { } return res; } - + XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){ xbt_dict_t head=NULL; int i,j,k, nb; @@ -662,26 +913,32 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){ srand((unsigned int)time(NULL)); - xbt_test_add0("CRASH test"); - xbt_test_log0("Fill the struct, count its elems and frees the structure (x10)"); - xbt_test_log1("using 1000 elements with %d chars long randomized keys.",SIZEOFKEY); - 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(); - // 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++) { + char *data = NULL; key=xbt_malloc(SIZEOFKEY); - for (k=0;k