X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b62f9b22bdb7ce4f07fedce31ef0e44fca807cd..f855cb1750800eae2b9a10573ae36acfb9ed8f36:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 23c6132d25..6e2135d20c 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -15,17 +15,15 @@ #include "xbt/str.h" #include "dict_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, - "Dictionaries provide the same functionalities as hash tables"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables"); /** * \brief Constructor * \return pointer to the destination - * \see xbt_dict_free() + * \see xbt_dict_new_homogenous(), 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. + * The dictionary is heterogeneous: each element can have a different free function. */ xbt_dict_t xbt_dict_new(void) { @@ -37,8 +35,7 @@ xbt_dict_t xbt_dict_new(void) /** * \brief Constructor - * \param free_ctn function to call with (\a data as argument) when - * \a data is removed from the dictionary + * \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(), xbt_dict_free() * @@ -47,6 +44,9 @@ xbt_dict_t xbt_dict_new(void) */ xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn) { + if (dict_elm_mallocator == NULL) + xbt_dict_preinit(); + xbt_dict_t dict; dict = xbt_new(s_xbt_dict_t, 1); @@ -95,10 +95,8 @@ void xbt_dict_free(xbt_dict_t * dict) } } -/** - * Returns the amount of elements in the dict - */ -XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) +/** Returns the amount of elements in the dict */ +inline unsigned int xbt_dict_size(xbt_dict_t dict) { return (dict ? (unsigned int) dict->count : (unsigned int) 0); } @@ -114,9 +112,7 @@ static void xbt_dict_rehash(xbt_dict_t dict) xbt_dictelm_t bucklet; xbt_dictelm_t *pprev; - currcell = - (xbt_dictelm_t *) xbt_realloc((char *) dict->table, - newsize * sizeof(xbt_dictelm_t)); + 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; @@ -127,8 +123,7 @@ static void xbt_dict_rehash(xbt_dict_t dict) continue; twincell = currcell + oldsize; for (pprev = currcell, bucklet = *currcell; bucklet; bucklet = *pprev) { - /* Since we use "& size" instead of "%size" and since the size was doubled, - each bucklet of this cell must either : + /* Since we use "& size" instead of "%size" and since the size was doubled, 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 */ @@ -141,7 +136,6 @@ static void xbt_dict_rehash(xbt_dict_t dict) } else { pprev = &bucklet->next; } - } if (!*currcell) /* everything moved */ @@ -155,28 +149,22 @@ 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 data as argument) when - * \a data is removed from the dictionary + * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary. This param + * will only be considered when the dict was instantiated with xbt_dict_new() and not xbt_dict_new_homogeneous() * - * 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. + * 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) +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_str_hash_ext(key, key_len); xbt_dictelm_t current, previous = NULL; - xbt_assert(dict); - XBT_CDEBUG(xbt_dict, - "ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code, + XBT_CDEBUG(xbt_dict, "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 && - (hash_code != current->hash_code || key_len != current->key_len + while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { previous = current; current = current->next; @@ -196,8 +184,7 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, } } else { XBT_CDEBUG(xbt_dict, "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 */ xbt_dictelm_set_data(dict, current, data, free_ctn); } @@ -209,17 +196,13 @@ 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 data as argument) when - * \a data is removed from the dictionary + * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary. This param + * will only be considered when the dict was instantiated with xbt_dict_new() and not xbt_dict_new_homogeneous() * - * set the \a data in the structure under the \a key, which is a - * null terminated string. + * set the \a data in the structure under the \a key, which is anull terminated string. */ -XBT_INLINE void xbt_dict_set(xbt_dict_t dict, - const char *key, void *data, - void_f_pvoid_t free_ctn) +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); } @@ -233,19 +216,12 @@ XBT_INLINE void xbt_dict_set(xbt_dict_t dict, * * Search the given \a key. Throws not_found_error when not found. */ -XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, - int key_len) +inline void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len) { - - unsigned int hash_code = xbt_str_hash_ext(key, key_len); - xbt_dictelm_t current; + xbt_dictelm_t current = dict->table[hash_code & dict->table_size]; - xbt_assert(dict); - - current = dict->table[hash_code & dict->table_size]; - while (current != NULL && - (hash_code != current->hash_code || key_len != current->key_len + while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { current = current->next; } @@ -256,21 +232,13 @@ XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, 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) +/** @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_str_hash_ext(key, key_len); - xbt_dictelm_t current; - - xbt_assert(dict); + xbt_dictelm_t current = dict->table[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 + while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len || memcmp(key, current->key, key_len))) { current = current->next; } @@ -288,26 +256,18 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, */ 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]; + for (int i = 0; i <= dict->table_size; i++) { + xbt_dictelm_t current = dict->table[i]; while (current != NULL) { if (current->content == data) return current->key; current = current->next; } } - return NULL; } -/** - * @brief retrieve the key associated to that xbt_dictelm_t. - * - */ +/** @brief retrieve the key associated to that xbt_dictelm_t. */ char *xbt_dict_get_elm_key(xbt_dictelm_t elm) { return elm->key; @@ -321,13 +281,13 @@ char *xbt_dict_get_elm_key(xbt_dictelm_t elm) * \return the data 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. + * Check xbt_dict_get_or_null() for a version returning NULL without exception when not found. */ -XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key) +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) * @@ -336,10 +296,9 @@ XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key) * \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. + * 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) +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); @@ -352,7 +311,7 @@ XBT_INLINE xbt_dictelm_t xbt_dict_get_elm(xbt_dict_t dict, const char *key) /** * \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) +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); @@ -361,24 +320,20 @@ XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) return current->content; } + /** * \brief like xbt_dict_get_elm(), but returning NULL when not found */ -XBT_INLINE xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *key) +inline xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *key) { unsigned int hash_code = xbt_str_hash(key); - xbt_dictelm_t current; + xbt_dictelm_t current = dict->table[hash_code & dict->table_size]; - 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; return current; } - /** * \brief Remove data from the dict (arbitrary key) * @@ -388,20 +343,13 @@ XBT_INLINE xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *k * * Remove the entry associated with the given \a key (throws not_found) */ -XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, - int key_len) +inline void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len) { - - unsigned int hash_code = xbt_str_hash_ext(key, key_len); - xbt_dictelm_t current, previous = NULL; - - xbt_assert(dict); + xbt_dictelm_t previous = NULL; + xbt_dictelm_t current = dict->table[hash_code & dict->table_size]; - // 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 + 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 */ current = current->next; @@ -423,8 +371,6 @@ XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, dict->count--; } - - /** * \brief Remove data from the dict (null-terminated key) * @@ -433,65 +379,20 @@ XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, * * Remove the entry associated with the given \a key */ -XBT_INLINE void xbt_dict_remove(xbt_dict_t dict, const char *key) +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 - */ +/** @brief Remove all data from the dict */ void xbt_dict_reset(xbt_dict_t dict) { - - int i; - xbt_dictelm_t current, previous = NULL; - - xbt_assert(dict); - if (dict->count == 0) return; - for (i = 0; i <= dict->table_size; i++) { - current = dict->table[i]; + for (int i = 0; i <= dict->table_size; i++) { + xbt_dictelm_t previous = NULL; + xbt_dictelm_t current = dict->table[i]; while (current != NULL) { previous = current; current = current->next; @@ -508,10 +409,8 @@ void xbt_dict_reset(xbt_dict_t dict) * \brief Return the number of elements in the dict. * \param dict a dictionary */ -XBT_INLINE int xbt_dict_length(xbt_dict_t dict) +inline int xbt_dict_length(xbt_dict_t dict) { - xbt_assert(dict); - return dict->count; } @@ -524,7 +423,7 @@ void xbt_dict_dump_output_string(void *s) /** * \brief test if the dict is empty or not */ -XBT_INLINE int xbt_dict_is_empty(xbt_dict_t dict) +inline int xbt_dict_is_empty(xbt_dict_t dict) { return !dict || (xbt_dict_length(dict) == 0); } @@ -535,10 +434,9 @@ XBT_INLINE int xbt_dict_is_empty(xbt_dict_t dict) * \param dict the exibitionist * \param output a function to dump each data in the tree (check @ref xbt_dict_dump_output_string) * - * 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. + * 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) { int i; @@ -569,58 +467,58 @@ 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; + + printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, dict->fill, dict->table_size); + + if (!dict) { + printf("\n"); + return; + } 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); + for (int i = 0; i < dict->table_size; i++) { + xbt_dictelm_t element = dict->table[i]; + size = 0; + if (element) { + while (element != NULL) { + size++; + element = element->next; } } - 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("%uelm x %u cells; ", count, size); + 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("%uelm x %u cells; ", count, size); + } printf("\n"); xbt_dynar_free(&sizes); } @@ -632,14 +530,14 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) */ 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); + if (dict_elm_mallocator == NULL) + dict_elm_mallocator = xbt_mallocator_new( + 256, dict_elm_mallocator_new_f, dict_elm_mallocator_free_f, + dict_elm_mallocator_reset_f); + if (dict_het_elm_mallocator == NULL) + 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); } /** @@ -676,21 +574,17 @@ void xbt_dict_postexit(void) #ifdef SIMGRID_TEST #include "xbt.h" #include "xbt/ex.h" -#include "src/portable.h" - -#define PRINTF_STR(a) (a)?:"(null)" +#include "src/internal_config.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); XBT_TEST_SUITE("dict", "Dict data container"); -static void debuged_add_ext(xbt_dict_t head, const char *key, - const char *data_to_fill, void_f_pvoid_t free_f) +static void debuged_add_ext(xbt_dict_t head, const char *key, const char *data_to_fill, void_f_pvoid_t free_f) { char *data = xbt_strdup(data_to_fill); - xbt_test_log("Add %s under %s", PRINTF_STR(data_to_fill), - PRINTF_STR(key)); + xbt_test_log("Add %s under %s", data_to_fill, key); xbt_dict_set(head, key, data, free_f); if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) { @@ -722,7 +616,6 @@ static void fill(xbt_dict_t * head, int homogeneous) debuged_add(*head, "123457", free_f); } - static void search_ext(xbt_dict_t head, const char *key, const char *data) { char *found; @@ -731,17 +624,12 @@ static void search_ext(xbt_dict_t head, const char *key, const char *data) found = xbt_dict_get(head, key); xbt_test_log("Found %s", found); if (data) { - xbt_test_assert(found, - "data do not match expectations: found NULL while searching for %s", - data); + xbt_test_assert(found, "data do not match expectations: found NULL while searching for %s", data); if (found) - xbt_test_assert(!strcmp(data, found), - "data do not match expectations: found %s while searching for %s", + xbt_test_assert(!strcmp(data, found), "data do not match expectations: found %s while searching for %s", found, data); } else { - xbt_test_assert(!found, - "data do not match expectations: found %s while searching for NULL", - found); + xbt_test_assert(!found, "data do not match expectations: found %s while searching for NULL", found); } } @@ -752,13 +640,11 @@ static void search(xbt_dict_t head, const char *key) static void debuged_remove(xbt_dict_t head, const char *key) { - - xbt_test_add("Remove '%s'", PRINTF_STR(key)); + xbt_test_add("Remove '%s'", 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; @@ -768,13 +654,11 @@ static void traverse(xbt_dict_t head) xbt_dict_foreach(head, cursor, key, data) { if (!key || !data || strcmp(key, data)) { - xbt_test_log("Seen #%d: %s->%s", ++i, PRINTF_STR(key), - PRINTF_STR(data)); + xbt_test_log("Seen #%d: %s->%s", ++i, key, data); } else { - xbt_test_log("Seen #%d: %s", ++i, PRINTF_STR(key)); + xbt_test_log("Seen #%d: %s", ++i, key); } - xbt_test_assert(!data || !strcmp(key, data), - "Key(%s) != value(%s). Aborting", key, data); + xbt_test_assert(!data || !strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data); } } @@ -787,10 +671,8 @@ static void search_not_found(xbt_dict_t head, const char *data) TRY { data = xbt_dict_get(head, data); - THROWF(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); @@ -806,18 +688,13 @@ static void count(xbt_dict_t dict, int length) void *data; int effective = 0; - 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_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length); xbt_dict_foreach(dict, cursor, key, data) effective++; - xbt_test_assert(effective == length, "Effective length(%d) != %d.", - effective, length); - + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } static void count_check_get_key(xbt_dict_t dict, int length) @@ -828,25 +705,16 @@ static void count_check_get_key(xbt_dict_t dict, int length) void *data; int effective = 0; - - 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_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_assert(!strcmp(key, key2), - "The data was registered under %s instead of %s as expected", - key2, key); + xbt_assert(!strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key); } - xbt_test_assert(effective == length, "Effective length(%d) != %d.", - effective, length); - + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } xbt_ex_t e; @@ -865,8 +733,7 @@ static void basic_test(int homogeneous) 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); @@ -959,8 +826,7 @@ static void remove_test(int homogeneous) xbt_test_add("Remove non existing data"); TRY { debuged_remove(head, "Does not exist"); - } - CATCH(e) { + } CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); @@ -969,8 +835,7 @@ static void remove_test(int homogeneous) xbt_dict_free(&head); - xbt_test_add - ("Remove each data manually (traversing the resulting dictionary each time)"); + xbt_test_add("Remove each data manually (traversing the resulting dictionary each time)"); fill(&head, homogeneous); debuged_remove(head, "12a"); traverse(head); @@ -986,8 +851,7 @@ static void remove_test(int homogeneous) count(head, 3); TRY { debuged_remove(head, "12346"); - } - CATCH(e) { + } CATCH(e) { if (e.category != not_found_error) xbt_test_exception(e); xbt_ex_free(e); @@ -1001,16 +865,14 @@ static void remove_test(int homogeneous) 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); } traverse(head); - xbt_test_add - ("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, homogeneous); xbt_dict_reset(head); @@ -1048,16 +910,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_log("Seen: %s->%s", PRINTF_STR(key), PRINTF_STR(data)); + xbt_test_log("Seen: %s->%s", key, data); } else { - xbt_test_log("Seen: %s", PRINTF_STR(key)); + xbt_test_log("Seen: %s", key); } if (!strcmp(key, "null")) found = 1; } - xbt_test_assert(found, - "the key 'null', associated to NULL is not found"); + xbt_test_assert(found, "the key 'null', associated to NULL is not found"); } xbt_dict_free(&head); } @@ -1087,11 +948,8 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") for (i = 0; i < 10; i++) { 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); + 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); */ for (j = 0; j < 1000; j++) { @@ -1108,9 +966,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_assert(!strcmp(key, data), - "Retrieved value (%s) != Injected value (%s)", key, - data); + xbt_test_assert(!strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data); count(head, j + 1); } @@ -1120,13 +976,10 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") xbt_dict_free(&head); } - head = xbt_dict_new(); - xbt_test_add("Fill %d elements, with keys being the number of element", - NB_ELM); + 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); } */ - key = xbt_malloc(10); sprintf(key, "%d", j); @@ -1134,8 +987,7 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") } /*xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add - ("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_log("There is %d elements", i); @@ -1145,15 +997,11 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") 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_assert(!strcmp(key, (char *) data), - "with get, key=%s != data=%s", 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_assert(!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); @@ -1162,13 +1010,11 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") key = xbt_malloc(10); for (j = 0; j < NB_ELM; j++) { /* if (!(j%10000)) printf("."); fflush(stdout); */ - sprintf(key, "%d", j); xbt_dict_remove(head, key); } free(key); - xbt_test_add("Free the structure (twice)"); xbt_dict_free(&head); xbt_dict_free(&head); @@ -1183,18 +1029,15 @@ XBT_TEST_UNIT("ext", test_dict_int, "Test dictionnary with int keys") int i; for (i = 0; i < count; ++i) xbt_dict_set_ext(dict, (char*) &i, sizeof(i), (void*) (intptr_t) i, NULL); - xbt_test_assert(xbt_dict_size(dict) == count, - "Bad number of elements in the dictionnary"); + xbt_test_assert(xbt_dict_size(dict) == count, "Bad number of elements in the dictionnary"); xbt_test_add("Check elements"); for (i = 0; i < count; ++i) { int res = (int) (intptr_t) xbt_dict_get_ext(dict, (char*) &i, sizeof(i)); - xbt_test_assert(xbt_dict_size(dict) == count, - "Unexpected value at index %i, expected %i but was %i", i, i, res); + xbt_test_assert(xbt_dict_size(dict) == count, "Unexpected value at index %i, expected %i but was %i", i, i, res); } xbt_test_add("Free the array"); xbt_dict_free(&dict); } - #endif /* SIMGRID_TEST */