X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c07ef1267acad0364557ca2695643be18be5547..f81bbb7e5632a77045d9330d2f8988ea0c9d4564:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 93b29eb989..a9227b5542 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,63 +1,61 @@ -/* $Id$ */ +/* dict - a generic dictionary, variation over hash table */ -/* dict - a generic dictionary, variation over the B-tree concept */ - -/* Copyright (c) 2003,2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004-2013. The SimGrid Team. + * All rights reserved. */ /* 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 "xbt/str.h" #include "dict_private.h" 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); +/** + * \brief Constructor + * \return pointer to the destination + * \see xbt_dict_free() + * + * Creates and initialize a new dictionary with a default hashtable size. + * The dictionary is heterogeneous: each element can have a different free + * function. + */ +xbt_dict_t xbt_dict_new(void) +{ + xbt_dict_t dict = xbt_dict_new_homogeneous(NULL); + dict->homogeneous = 0; -/*####[ Code ]###############################################################*/ + return dict; +} /** * \brief Constructor + * \param free_ctn function to call with (\a data as argument) when + * \a data is removed from the dictionary * \return pointer to the destination - * \see xbt_dict_new_ext(), xbt_dict_free() + * \see xbt_dict_new(), xbt_dict_free() * * Creates and initialize a new dictionary with a default hashtable size. + * The dictionary is homogeneous: each element share the same free function. */ -xbt_dict_t xbt_dict_new(void) +xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn) { 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 = xbt_new(s_xbt_dict_t, 1); + dict->free_f = free_ctn; dict->table_size = 127; dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1); dict->count = 0; dict->fill = 0; + dict->homogeneous = 1; return dict; } @@ -80,17 +78,19 @@ 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; current = current->next; - xbt_dictelm_free(previous); + xbt_dictelm_free(*dict, previous); (*dict)->count--; } } xbt_free(table); - xbt_mallocator_release(dict_mallocator, *dict); + xbt_free(*dict); *dict = NULL; } } @@ -98,85 +98,9 @@ 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) -{ - 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) -{ - - -#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++; - } - -# else - register unsigned int hash = 0; - - while (str_len--) { - hash += (*str) * (*str); - str++; - } -#endif - - return hash; -} - -static XBT_INLINE unsigned int xbt_dict_hash(const char *str) +XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) { -#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 */ - } - -# 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 byte */ - hash ^= (unsigned int) *str++; - } - -# else - register unsigned int hash = 0; - - while (*str) { - hash += (*str) * (*str); - str++; - } -#endif - return hash; + return (dict ? (unsigned int) dict->count : (unsigned int) 0); } /* Expend the size of the dict */ @@ -191,12 +115,12 @@ static void xbt_dict_rehash(xbt_dict_t dict) register xbt_dictelm_t *pprev; currcell = - (xbt_dictelm_t *) xbt_realloc((char *) dict->table, - newsize * sizeof(xbt_dictelm_t)); + (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); + XBT_DEBUG("REHASH (%d->%d)", oldsize, newsize); for (i = 0; i < oldsize; i++, currcell++) { if (!*currcell) /* empty cell */ @@ -231,8 +155,8 @@ static void xbt_dict_rehash(xbt_dict_t dict) * \param key the key to set the new data * \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 dictionary + * \param free_ctn function to call with (\a data as argument) when + * \a data 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. @@ -242,12 +166,12 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, void *data, void_f_pvoid_t free_ctn) { - unsigned int hash_code = xbt_dict_hash_ext(key, key_len); + unsigned int hash_code = xbt_str_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, + XBT_DEBUG("ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code, dict->table_size, hash_code & dict->table_size); current = dict->table[hash_code & dict->table_size]; while (current != NULL && @@ -259,7 +183,7 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, if (current == NULL) { /* this key doesn't exist yet */ - current = xbt_dictelm_new(key, key_len, hash_code, data, free_ctn); + current = xbt_dictelm_new(dict, key, key_len, hash_code, data, free_ctn); dict->count++; if (previous == NULL) { dict->table[hash_code & dict->table_size] = current; @@ -270,16 +194,11 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, previous->next = current; } } else { - - DEBUG6("Replace %.*s by %.*s under key %.*s", + XBT_DEBUG("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); - } - current->content = data; - current->free_f = free_ctn; + xbt_dictelm_set_data(dict, current, data, free_ctn); } } @@ -289,14 +208,15 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, * \param dict the 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 dictionary + * \param free_ctn function to call with (\a data as argument) when + * \a data 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); @@ -312,11 +232,12 @@ 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_str_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); @@ -329,7 +250,7 @@ void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len) } if (current == NULL) - THROW2(not_found_error, 0, "key %.*s not found", key_len, key); + THROWF(not_found_error, 0, "key %.*s not found", key_len, key); return current->content; } @@ -337,9 +258,11 @@ void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len) /** * \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) +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); + + unsigned int hash_code = xbt_str_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); @@ -362,7 +285,8 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len) * * Returns NULL if the object cannot be found */ -char *xbt_dict_get_key(xbt_dict_t dict, void*data) { +char *xbt_dict_get_key(xbt_dict_t dict, const void *data) +{ int i; xbt_dictelm_t current; @@ -390,44 +314,58 @@ char *xbt_dict_get_key(xbt_dict_t dict, void*data) { * 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) { + return xbt_dict_get_elm(dict, key)->content; +} +/** + * \brief Retrieve element from the dict (null-terminated key) + * + * \param dict the dealer of data + * \param key the key to find data + * \return the s_xbt_dictelm_t that we are looking for + * + * Search the given \a key. Throws not_found_error when not found. + * Check xbt_dict_get_or_null() for a version returning NULL without exception when + * not found. + */ +XBT_INLINE xbt_dictelm_t xbt_dict_get_elm(xbt_dict_t dict, const char *key) +{ + xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key); - unsigned int hash_code = xbt_dict_hash(key); - xbt_dictelm_t current; - - xbt_assert(dict); + if (current == NULL) + THROWF(not_found_error, 0, "key %s not found", key); - current = dict->table[hash_code & dict->table_size]; - while (current != NULL - && (hash_code != current->hash_code || strcmp(key, current->key))) - current = current->next; + return current; +} +/** + * \brief like xbt_dict_get(), but returning NULL when not found + */ +XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) +{ + xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key); + if (current == NULL) - THROW1(not_found_error, 0, "key %s not found", key); + return NULL; return current->content; } - /** - * \brief like xbt_dict_get(), but returning NULL when not found + * \brief like xbt_dict_get_elm(), but returning NULL when not found */ -void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) +XBT_INLINE xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *key) { - unsigned int hash_code = xbt_dict_hash(key); + unsigned int hash_code = xbt_str_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)) + (hash_code != current->hash_code || strcmp(key, current->key))) current = current->next; - - if (current == NULL) - return NULL; - - return current->content; + return current; } @@ -440,11 +378,12 @@ void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) * * 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_str_hash_ext(key, key_len); xbt_dictelm_t current, previous = NULL; xbt_assert(dict); @@ -459,7 +398,7 @@ void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) } if (current == NULL) - THROW2(not_found_error, 0, "key %.*s not found", key_len, key); + THROWF(not_found_error, 0, "key %.*s not found", key_len, key); if (previous != NULL) { previous->next = current->next; @@ -470,10 +409,12 @@ void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) if (!dict->table[hash_code & dict->table_size]) dict->fill--; - xbt_dictelm_free(current); + xbt_dictelm_free(dict, current); dict->count--; } + + /** * \brief Remove data from the dict (null-terminated key) * @@ -482,11 +423,48 @@ void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) * * 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)); } +#ifdef XBT_USE_DEPRECATED +/** + * \brief Add data to the dict (arbitrary key) + * \param dict the container + * \param key the key to set the new data + * \param data the data to add in the dict + * + * Set the \a data in the structure under the \a key. + * Both \a data and \a key are considered as uintptr_t. + */ +XBT_INLINE void xbt_dicti_set(xbt_dict_t dict, + uintptr_t key, uintptr_t data) +{ + xbt_dict_set_ext(dict, (void *)&key, sizeof key, (void*)data, NULL); +} + +/** + * \brief Retrieve data from the dict (key considered as a uintptr_t) + * + * \param dict the dealer of data + * \param key the key to find data + * \return the data that we are looking for (or 0 if not found) + * + * Mixing uintptr_t keys with regular keys in the same dict is discouraged + */ +XBT_INLINE uintptr_t xbt_dicti_get(xbt_dict_t dict, uintptr_t key) +{ + return (uintptr_t)xbt_dict_get_or_null_ext(dict, (void *)&key, sizeof key); +} + +/** Remove a uintptr_t key from the dict */ +XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) +{ + xbt_dict_remove_ext(dict, (void *)&key, sizeof key); +} +#endif + /** * \brief Remove all data from the dict * \param dict the dict @@ -507,7 +485,7 @@ void xbt_dict_reset(xbt_dict_t dict) while (current != NULL) { previous = current; current = current->next; - xbt_dictelm_free(previous); + xbt_dictelm_free(dict, previous); } dict->table[i] = NULL; } @@ -520,7 +498,7 @@ 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); @@ -533,6 +511,13 @@ void xbt_dict_dump_output_string(void *s) fputs(s, stdout); } +/** + * \brief test if the dict is empty or not + */ +XBT_INLINE int xbt_dict_is_empty(xbt_dict_t dict) +{ + return !dict || (xbt_dict_length(dict) == 0); +} /** * \brief Outputs the content of the structure (debugging purpose) @@ -557,7 +542,7 @@ void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output) while (element != NULL) { printf(" %s -> '", element->key); if (output != NULL) { - (*output) (element->content); + output(element->content); } printf("'\n"); element = element->next; @@ -623,24 +608,41 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) continue; if (size == 0) continue; - printf("%delm x %u cells; ", count, size); + printf("%uelm x %u cells; ", count, size); } } printf("\n"); xbt_dynar_free(&sizes); } +/** + * Create the dict mallocators. + * This is an internal XBT function called during the lib initialization. + * It can be used several times to recreate the mallocator, for example when you switch to MC mode + */ +void xbt_dict_preinit(void) +{ + dict_elm_mallocator = xbt_mallocator_new(256, + dict_elm_mallocator_new_f, + dict_elm_mallocator_free_f, + dict_elm_mallocator_reset_f); + dict_het_elm_mallocator = xbt_mallocator_new(256, + dict_het_elm_mallocator_new_f, + dict_het_elm_mallocator_free_f, + dict_het_elm_mallocator_reset_f); +} + /** * Destroy the dict mallocators. - * This is an internal XBT function called by xbt_exit(). + * This is an internal XBT function during the lib initialization */ -void xbt_dict_exit(void) +void xbt_dict_postexit(void) { - if (dict_mallocator != NULL) { - xbt_mallocator_free(dict_mallocator); - dict_mallocator = NULL; + if (dict_elm_mallocator != NULL) { xbt_mallocator_free(dict_elm_mallocator); dict_elm_mallocator = NULL; + xbt_mallocator_free(dict_het_elm_mallocator); + dict_het_elm_mallocator = NULL; } if (all_sizes) { unsigned int count; @@ -653,7 +655,7 @@ void xbt_dict_exit(void) continue; if (size == 0) continue; - printf("%delm x %d cells; ", count, size); + printf("%uelm x %d cells; ", count, size); avg += count * size; total_count += size; } @@ -661,71 +663,51 @@ void xbt_dict_exit(void) } } -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" #include "portable.h" -XBT_LOG_EXTERNAL_CATEGORY(xbt_dict); -XBT_LOG_DEFAULT_CATEGORY(xbt_dict); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); XBT_TEST_SUITE("dict", "Dict data container"); -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) + const char *data_to_fill, void_f_pvoid_t free_f) { char *data = xbt_strdup(data_to_fill); - xbt_test_log2("Add %s under %s", PRINTF_STR(data_to_fill), PRINTF_STR(key)); + xbt_test_log("Add %s under %s", PRINTF_STR(data_to_fill), + PRINTF_STR(key)); - xbt_dict_set(head, key, data, &free); + xbt_dict_set(head, key, data, free_f); 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) +static void debuged_add(xbt_dict_t head, const char *key, void_f_pvoid_t free_f) { - debuged_add_ext(head, key, key); + debuged_add_ext(head, key, key, free_f); } -static void fill(xbt_dict_t * head) +static void fill(xbt_dict_t * head, int homogeneous) { - 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"); + void_f_pvoid_t free_f = homogeneous ? NULL : &free; + + xbt_test_add("Fill in the dictionnary"); + + *head = homogeneous ? xbt_dict_new_homogeneous(&free) : xbt_dict_new(); + debuged_add(*head, "12", free_f); + debuged_add(*head, "12a", free_f); + debuged_add(*head, "12b", free_f); + debuged_add(*head, "123", free_f); + debuged_add(*head, "123456", free_f); /* Child becomes child of what to add */ - debuged_add(*head, "1234"); + debuged_add(*head, "1234", free_f); /* Need of common ancestor */ - debuged_add(*head, "123457"); + debuged_add(*head, "123457", free_f); } @@ -733,17 +715,22 @@ static void search_ext(xbt_dict_t head, const char *key, const char *data) { void *found; - xbt_test_add1("Search %s", key); + xbt_test_add("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); - 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_log("Found %s", (char *) found); + if (data) { + xbt_test_assert(found, + "data do not match expectations: found NULL while searching for %s", + data); + if (found) + xbt_test_assert(!strcmp((char *) data, found), + "data do not match expectations: found %s while searching for %s", + (char *) found, data); + } else { + xbt_test_assert(!found, + "data do not match expectations: found %s while searching for NULL", + found); + } } static void search(xbt_dict_t head, const char *key) @@ -754,7 +741,7 @@ static void search(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_test_add("Remove '%s'", PRINTF_STR(key)); xbt_dict_remove(head, key); /* xbt_dict_dump(head,(void (*)(void*))&printf); */ } @@ -769,12 +756,12 @@ static void traverse(xbt_dict_t head) xbt_dict_foreach(head, cursor, key, data) { if (!key || !data || strcmp(key, data)) { - xbt_test_log3("Seen #%d: %s->%s", ++i, PRINTF_STR(key), + xbt_test_log("Seen #%d: %s->%s", ++i, PRINTF_STR(key), PRINTF_STR(data)); } else { - xbt_test_log2("Seen #%d: %s", ++i, PRINTF_STR(key)); + xbt_test_log("Seen #%d: %s", ++i, PRINTF_STR(key)); } - xbt_test_assert2(!data || !strcmp(key, data), + xbt_test_assert(!data || !strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data); } } @@ -784,19 +771,20 @@ 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_add("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); - } CATCH(e) { + THROWF(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"); + xbt_test_assert(ok, "Exception not raised"); } static void count(xbt_dict_t dict, int length) @@ -807,15 +795,15 @@ static void count(xbt_dict_t dict, int length) int effective = 0; - xbt_test_add1("Count elements (expecting %d)", length); - xbt_test_assert2(xbt_dict_length(dict) == length, + xbt_test_add("Count elements (expecting %d)", length); + xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length); xbt_dict_foreach(dict, cursor, key, data) - effective++; + effective++; - xbt_test_assert2(effective == length, "Effective length(%d) != %d.", + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } @@ -823,24 +811,28 @@ static void count(xbt_dict_t dict, int length) static void count_check_get_key(xbt_dict_t dict, int length) { xbt_dict_cursor_t cursor; - char *key,*key2; + char *key; + _XBT_GNUC_UNUSED char *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, + xbt_test_add + ("Count elements (expecting %d), and test the getkey function", + length); + xbt_test_assert(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); + key2 = xbt_dict_get_key(dict, data); + xbt_assert(!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.", + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } @@ -849,63 +841,67 @@ xbt_ex_t e; xbt_dict_t head = NULL; char *data; - -XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse") +static void basic_test(int homogeneous) { - xbt_test_add0("Traversal the null dictionary"); + void_f_pvoid_t free_f; + + xbt_test_add("Traversal the null dictionary"); traverse(head); - xbt_test_add0("Traversal and search the empty dictionary"); - head = xbt_dict_new(); + xbt_test_add("Traversal and search the empty dictionary"); + head = homogeneous ? xbt_dict_new_homogeneous(&free) : xbt_dict_new(); traverse(head); TRY { debuged_remove(head, "12346"); - } CATCH(e) { + } + 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 dictionary"); - fill(&head); + free_f = homogeneous ? NULL : &free; + + xbt_test_add("Traverse the full dictionary"); + fill(&head, homogeneous); count_check_get_key(head, 7); - debuged_add_ext(head, "toto", "tutu"); + debuged_add_ext(head, "toto", "tutu", free_f); search_ext(head, "toto", "tutu"); debuged_remove(head, "toto"); search(head, "12a"); traverse(head); - xbt_test_add0("Free the dictionary (twice)"); + xbt_test_add("Free the dictionary (twice)"); xbt_dict_free(&head); xbt_dict_free(&head); /* CHANGING */ - fill(&head); + fill(&head, homogeneous); count_check_get_key(head, 7); - xbt_test_add0("Change 123 to 'Changed 123'"); - xbt_dict_set(head, "123", strdup("Changed 123"), &free); + xbt_test_add("Change 123 to 'Changed 123'"); + xbt_dict_set(head, "123", strdup("Changed 123"), free_f); count_check_get_key(head, 7); - xbt_test_add0("Change 123 back to '123'"); - xbt_dict_set(head, "123", strdup("123"), &free); + xbt_test_add("Change 123 back to '123'"); + xbt_dict_set(head, "123", strdup("123"), free_f); count_check_get_key(head, 7); - xbt_test_add0("Change 12a to 'Dummy 12a'"); - xbt_dict_set(head, "12a", strdup("Dummy 12a"), &free); + xbt_test_add("Change 12a to 'Dummy 12a'"); + xbt_dict_set(head, "12a", strdup("Dummy 12a"), free_f); count_check_get_key(head, 7); - xbt_test_add0("Change 12a to '12a'"); - xbt_dict_set(head, "12a", strdup("12a"), &free); + xbt_test_add("Change 12a to '12a'"); + xbt_dict_set(head, "12a", strdup("12a"), free_f); count_check_get_key(head, 7); - xbt_test_add0("Traverse the resulting dictionary"); + xbt_test_add("Traverse the resulting dictionary"); traverse(head); /* RETRIEVE */ - xbt_test_add0("Search 123"); + xbt_test_add("Search 123"); data = xbt_dict_get(head, "123"); xbt_test_assert(data); xbt_test_assert(!strcmp("123", data)); @@ -921,24 +917,34 @@ XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse" search(head, "1234"); search(head, "123457"); - xbt_test_add0("Traverse the resulting dictionary"); + xbt_test_add("Traverse the resulting dictionary"); traverse(head); /* xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add0("Free the dictionary twice"); + xbt_test_add("Free the dictionary twice"); xbt_dict_free(&head); xbt_dict_free(&head); - xbt_test_add0("Traverse the resulting dictionary"); + xbt_test_add("Traverse the resulting dictionary"); traverse(head); } -XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") +XBT_TEST_UNIT("basic_heterogeneous", test_dict_basic_heterogeneous, "Basic usage: change, retrieve, traverse: heterogeneous dict") +{ + basic_test(0); +} + +XBT_TEST_UNIT("basic_homogeneous", test_dict_basic_homogeneous, "Basic usage: change, retrieve, traverse: homogeneous dict") +{ + basic_test(1); +} + +static void remove_test(int homogeneous) { - fill(&head); + fill(&head, homogeneous); count(head, 7); - xbt_test_add0("Remove non existing data"); + xbt_test_add("Remove non existing data"); TRY { debuged_remove(head, "Does not exist"); } @@ -951,9 +957,9 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") xbt_dict_free(&head); - xbt_test_add0 - ("Remove each data manually (traversing the resulting dictionary each time)"); - fill(&head); + xbt_test_add + ("Remove each data manually (traversing the resulting dictionary each time)"); + fill(&head, homogeneous); debuged_remove(head, "12a"); traverse(head); count(head, 6); @@ -991,27 +997,38 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") } traverse(head); - xbt_test_add0("Free dict, create new fresh one, and then reset the dict"); + xbt_test_add + ("Free dict, create new fresh one, and then reset the dict"); xbt_dict_free(&head); - fill(&head); + fill(&head, homogeneous); xbt_dict_reset(head); count(head, 0); traverse(head); - xbt_test_add0("Free the dictionary twice"); + xbt_test_add("Free the dictionary twice"); xbt_dict_free(&head); xbt_dict_free(&head); } +XBT_TEST_UNIT("remove_heterogeneous", test_dict_remove_heterogeneous, "Removing some values: heterogeneous dict") +{ + remove_test(0); +} + +XBT_TEST_UNIT("remove_homogeneous", test_dict_remove_homogeneous, "Removing some values: homogeneous dict") +{ + remove_test(1); +} + XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") { - fill(&head); + fill(&head, 1); - xbt_test_add0("Store NULL under 'null'"); + xbt_test_add("Store NULL under 'null'"); xbt_dict_set(head, "null", NULL, NULL); search_ext(head, "null", NULL); - xbt_test_add0("Check whether I see it while traversing..."); + xbt_test_add("Check whether I see it while traversing..."); { xbt_dict_cursor_t cursor = NULL; char *key; @@ -1019,15 +1036,15 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") 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_test_log("Seen: %s->%s", PRINTF_STR(key), PRINTF_STR(data)); } else { - xbt_test_log1("Seen: %s", PRINTF_STR(key)); + xbt_test_log("Seen: %s", PRINTF_STR(key)); } if (!strcmp(key, "null")) found = 1; } - xbt_test_assert0(found, + xbt_test_assert(found, "the key 'null', associated to NULL is not found"); } xbt_dict_free(&head); @@ -1051,20 +1068,20 @@ static int countelems(xbt_dict_t head) XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") { xbt_dict_t head = NULL; - int i, j, k, nb; + int i, j, k; char *key; - void *data; 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); - 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); + xbt_test_add("CRASH test number %d (%d to go)", i + 1, 10 - i - 1); + xbt_test_log + ("Fill the struct, count its elems and frees the structure"); + xbt_test_log + ("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++) { char *data = NULL; key = xbt_malloc(SIZEOFKEY); @@ -1079,7 +1096,7 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") xbt_dict_set(head, key, key, &free); data = xbt_dict_get(head, key); - xbt_test_assert2(!strcmp(key, data), + xbt_test_assert(!strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data); @@ -1093,7 +1110,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", + xbt_test_add("Fill %d elements, with keys being the number of element", NB_ELM); for (j = 0; j < NB_ELM; j++) { /* if (!(j%1000)) { printf("."); fflush(stdout); } */ @@ -1105,28 +1122,31 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") } /*xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add0("Count the elements (retrieving the key and data for each)"); + xbt_test_add + ("Count the elements (retrieving the key and data for each)"); i = countelems(head); - xbt_test_log1("There is %d elements", i); + xbt_test_log("There is %d elements", i); - xbt_test_add1("Search my %d elements 20 times", NB_ELM); + xbt_test_add("Search my %d elements 20 times", NB_ELM); key = xbt_malloc(10); for (i = 0; i < 20; i++) { + void *data; /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ for (j = 0; j < NB_ELM; j++) { sprintf(key, "%d", j); data = xbt_dict_get(head, key); - xbt_test_assert2(!strcmp(key, (char *) data), + xbt_test_assert(!strcmp(key, (char *) data), "with get, key=%s != data=%s", key, (char *) data); data = xbt_dict_get_ext(head, key, strlen(key)); - xbt_test_assert2(!strcmp(key, (char *) data), - "with get_ext, key=%s != data=%s", key, (char *) data); + xbt_test_assert(!strcmp(key, (char *) data), + "with get_ext, key=%s != data=%s", key, + (char *) data); } } free(key); - xbt_test_add1("Remove my %d elements", NB_ELM); + xbt_test_add("Remove my %d elements", NB_ELM); key = xbt_malloc(10); for (j = 0; j < NB_ELM; j++) { /* if (!(j%10000)) printf("."); fflush(stdout); */ @@ -1137,87 +1157,9 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") free(key); - xbt_test_add0("Free the structure (twice)"); + xbt_test_add("Free the structure (twice)"); xbt_dict_free(&head); xbt_dict_free(&head); } -static void str_free(void *s) -{ - char *c = *(char **) s; - free(c); -} - -XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") -{ - -#undef NB_ELM -#define NB_ELM 100 /*00 */ -#define DEPTH 5 -#define KEY_SIZE 512 -#define NB_TEST 20 /*20 */ - int verbose = 0; - - xbt_dict_t mdict = NULL; - int i, j, k, l; - xbt_dynar_t keys = xbt_dynar_new(sizeof(char *), str_free); - void *data; - char *key; - - - xbt_test_add0("Generic multicache CRASH test"); - xbt_test_log4(" Fill the struct and frees it %d times, using %d elements, " - "depth of multicache=%d, key size=%d", - NB_TEST, NB_ELM, DEPTH, KEY_SIZE); - - for (l = 0; l < DEPTH; l++) { - key = xbt_malloc(KEY_SIZE); - xbt_dynar_push(keys, &key); - } - - for (i = 0; i < NB_TEST; i++) { - mdict = xbt_dict_new(); - 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; j < NB_ELM; j++) { - if (verbose > 0) - printf(" Add {"); - - for (l = 0; l < DEPTH; l++) { - key = *(char **) xbt_dynar_get_ptr(keys, l); - - for (k = 0; k < KEY_SIZE - 1; k++) - key[k] = rand() % ('z' - 'a') + 'a'; - - key[k] = '\0'; - - if (verbose > 0) - printf("%p=%s %s ", key, key, (l < DEPTH - 1 ? ";" : "}")); - } - if (verbose > 0) - printf("in multitree %p.\n", mdict); - - xbt_multidict_set(mdict, keys, xbt_strdup(key), free); - - data = xbt_multidict_get(mdict, keys); - - 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); - } - - xbt_dynar_free(&keys); - - /* if (verbose>0) - xbt_dict_dump(mdict,&xbt_dict_print); */ - - xbt_dict_free(&mdict); - xbt_dynar_free(&keys); - -} -#endif /* SIMGRID_TEST */ +#endif /* SIMGRID_TEST */