X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dc32b45a60779e81ee8e3d4b9d7f8e78fc1e0b3..d1417d67aeace547abaeee6766911a4e734526b3:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 21b8f6019b..7f1c91a3c3 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,7 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2003-2010 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */ @@ -39,18 +40,6 @@ xbt_dict_t xbt_dict_new(void) { 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); @@ -100,13 +89,14 @@ void xbt_dict_free(xbt_dict_t * dict) */ XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) { - return dict->count; + return (dict ? (unsigned int) dict->count : (unsigned int) 0); } /** * 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) { @@ -127,7 +117,8 @@ static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) 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 << 1) + (hash << 4) + (hash << 7) + (hash << 8) + + (hash << 24); /* xor the bottom with the current octet */ hash ^= (unsigned int) *bp++; @@ -162,7 +153,8 @@ 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 << 1) + (hash << 4) + (hash << 7) + (hash << 8) + + (hash << 24); /* xor the bottom with the current byte */ hash ^= (unsigned int) *str++; @@ -191,12 +183,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 +223,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. @@ -247,7 +239,7 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, 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 = %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 && @@ -271,7 +263,7 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, } } 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 */ @@ -289,14 +281,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. */ XBT_INLINE void xbt_dict_set(xbt_dict_t dict, - const char *key, void *data, void_f_pvoid_t free_ctn) + const char *key, void *data, + void_f_pvoid_t free_ctn) { xbt_dict_set_ext(dict, key, strlen(key), data, free_ctn); @@ -312,7 +305,8 @@ 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) +XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, + int key_len) { @@ -337,7 +331,8 @@ XBT_INLINE 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); @@ -363,7 +358,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, const void*data) { +char *xbt_dict_get_key(xbt_dict_t dict, const void *data) +{ int i; xbt_dictelm_t current; @@ -422,7 +418,7 @@ XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) 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) @@ -441,7 +437,8 @@ XBT_INLINE 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) */ -XBT_INLINE 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) { @@ -494,28 +491,29 @@ XBT_INLINE void xbt_dict_remove(xbt_dict_t dict, const char *key) * \brief Add data to the dict (arbitrary key) * \param dict the container * \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 * - * 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. + * 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) { + uintptr_t key, uintptr_t data) +{ - unsigned int hash_code = xbt_dict_hash_ext((void*)&key, sizeof(uintptr_t)); + unsigned int hash_code = + xbt_dict_hash_ext((void *) &key, sizeof(uintptr_t)); xbt_dictelm_t current, previous = NULL; xbt_assert(dict); - DEBUG5("ADD %zu->%zu; hash = %d, size = %d, & = %d", key, data, hash_code, - dict->table_size, hash_code & dict->table_size); + XBT_DEBUG("ADD %zu->%zu; hash = %d, size = %d, & = %d", key, data, + 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 || sizeof(uintptr_t) != current->key_len - || (((uintptr_t)key) != ((uintptr_t)current->key)) )) { + (hash_code != current->hash_code + || sizeof(uintptr_t) != current->key_len + || (((uintptr_t) key) != ((uintptr_t) current->key)))) { + previous = current; current = current->next; } @@ -537,7 +535,7 @@ XBT_INLINE void xbt_dicti_set(xbt_dict_t dict, if (current->content != NULL && current->free_f != NULL) { current->free_f(current->content); } - current->content = (void*)data; + current->content = (void *) data; current->free_f = NULL; } } @@ -551,37 +549,43 @@ XBT_INLINE void xbt_dicti_set(xbt_dict_t dict, * * 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) { +XBT_INLINE uintptr_t xbt_dicti_get(xbt_dict_t dict, uintptr_t key) +{ - unsigned int hash_code = xbt_dict_hash_ext(((void*)&key), sizeof(uintptr_t)); + unsigned int hash_code = + xbt_dict_hash_ext(((void *) &key), sizeof(uintptr_t)); xbt_dictelm_t current; xbt_assert(dict); current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || sizeof(uintptr_t) != current->key_len - || (((uintptr_t)key) != ((uintptr_t)current->key)) )) { + (hash_code != current->hash_code + || sizeof(uintptr_t) != current->key_len + || (((uintptr_t) key) != ((uintptr_t) current->key)))) { current = current->next; } if (current == NULL) return 0; - return (uintptr_t)(current->content); + return (uintptr_t) (current->content); } /** Remove a uintptr_t key from the dict */ -XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) { +XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) +{ - unsigned int hash_code = xbt_dict_hash_ext(((void*)&key), sizeof(uintptr_t)); + unsigned int hash_code = + xbt_dict_hash_ext(((void *) &key), sizeof(uintptr_t)); xbt_dictelm_t current, previous = NULL; current = dict->table[hash_code & dict->table_size]; while (current != NULL && - (hash_code != current->hash_code || sizeof(uintptr_t) != current->key_len - || (((uintptr_t)key) != ((uintptr_t)current->key)) )) { + (hash_code != current->hash_code + || sizeof(uintptr_t) != current->key_len + || (((uintptr_t) key) != ((uintptr_t) current->key)))) { previous = current; /* save the previous node */ current = current->next; } @@ -649,6 +653,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 (xbt_dict_size(dict) == 0); +} /** * \brief Outputs the content of the structure (debugging purpose) @@ -746,11 +757,34 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) 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) +{ + if (dict_mallocator != NULL) { + /* Already created. I guess we want to switch to MC mode, so kill the previously created mallocator */ + xbt_mallocator_free(dict_mallocator); + xbt_mallocator_free(dict_elm_mallocator); + } + + 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); +} + /** * 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); @@ -814,7 +848,8 @@ static void debuged_add_ext(xbt_dict_t head, const char *key, { 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); if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) { @@ -830,7 +865,7 @@ static void debuged_add(xbt_dict_t head, const char *key) static void fill(xbt_dict_t * head) { - xbt_test_add0("Fill in the dictionnary"); + xbt_test_add("Fill in the dictionnary"); *head = xbt_dict_new(); debuged_add(*head, "12"); @@ -849,15 +884,15 @@ 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); + xbt_test_log("Found %s", (char *) found); if (data) - xbt_test_assert1(found, + xbt_test_assert(found, "data do not match expectations: found NULL while searching for %s", data); if (found) - xbt_test_assert2(!strcmp((char *) data, found), + xbt_test_assert(!strcmp((char *) data, found), "data do not match expectations: found %s while searching for %s", (char *) found, data); } @@ -870,7 +905,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); */ } @@ -885,12 +920,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); } } @@ -900,19 +935,19 @@ 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); + 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"); + xbt_test_assert(ok, "Exception not raised"); } static void count(xbt_dict_t dict, int length) @@ -923,15 +958,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); } @@ -939,24 +974,27 @@ 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, *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_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.", + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } @@ -966,12 +1004,12 @@ xbt_dict_t head = NULL; char *data; -XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse") +XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve, traverse") { - xbt_test_add0("Traversal the null dictionary"); + xbt_test_add("Traversal the null dictionary"); traverse(head); - xbt_test_add0("Traversal and search the empty dictionary"); + xbt_test_add("Traversal and search the empty dictionary"); head = xbt_dict_new(); traverse(head); TRY { @@ -983,7 +1021,7 @@ XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse" } xbt_dict_free(&head); - xbt_test_add0("Traverse the full dictionary"); + xbt_test_add("Traverse the full dictionary"); fill(&head); count_check_get_key(head, 7); @@ -994,34 +1032,34 @@ XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse" 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); count_check_get_key(head, 7); - xbt_test_add0("Change 123 to 'Changed 123'"); + xbt_test_add("Change 123 to 'Changed 123'"); xbt_dict_set(head, "123", strdup("Changed 123"), &free); count_check_get_key(head, 7); - xbt_test_add0("Change 123 back to '123'"); + xbt_test_add("Change 123 back to '123'"); xbt_dict_set(head, "123", strdup("123"), &free); count_check_get_key(head, 7); - xbt_test_add0("Change 12a to 'Dummy 12a'"); + xbt_test_add("Change 12a to 'Dummy 12a'"); xbt_dict_set(head, "12a", strdup("Dummy 12a"), &free); count_check_get_key(head, 7); - xbt_test_add0("Change 12a to '12a'"); + xbt_test_add("Change 12a to '12a'"); xbt_dict_set(head, "12a", strdup("12a"), &free); 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)); @@ -1037,16 +1075,16 @@ 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); } @@ -1054,7 +1092,7 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") { fill(&head); count(head, 7); - xbt_test_add0("Remove non existing data"); + xbt_test_add("Remove non existing data"); TRY { debuged_remove(head, "Does not exist"); } @@ -1067,8 +1105,8 @@ 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)"); + xbt_test_add + ("Remove each data manually (traversing the resulting dictionary each time)"); fill(&head); debuged_remove(head, "12a"); traverse(head); @@ -1107,14 +1145,15 @@ 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); 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); } @@ -1123,11 +1162,11 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") { fill(&head); - 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; @@ -1135,36 +1174,39 @@ 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); } -static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) { - xbt_test_log2("Add %zu under %zu", data, key); +static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) +{ + uintptr_t stored_data = 0; + xbt_test_log("Add %zu under %zu", data, key); xbt_dicti_set(head, key, data); if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) { xbt_dict_dump(head, (void (*)(void *)) &printf); fflush(stdout); } - uintptr_t stored_data = xbt_dicti_get(head, key); - xbt_test_assert3(stored_data==data, - "Retrieved data (%zu) is not what I just stored (%zu) under key %zu",stored_data,data,key); + stored_data = xbt_dicti_get(head, key); + xbt_test_assert(stored_data == data, + "Retrieved data (%zu) is not what I just stored (%zu) under key %zu", + stored_data, data, key); } XBT_TEST_UNIT("dicti", test_dict_scalar, "Scalar data and key management") { - xbt_test_add0("Fill in the dictionnary"); + xbt_test_add("Fill in the dictionnary"); head = xbt_dict_new(); debuged_addi(head, 12, 12); @@ -1213,10 +1255,12 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") 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; @@ -1234,7 +1278,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); @@ -1248,7 +1292,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); } */ @@ -1260,11 +1304,12 @@ 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++) { /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ @@ -1272,16 +1317,17 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") 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); */ @@ -1292,7 +1338,7 @@ 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); } @@ -1320,10 +1366,11 @@ XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") 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); + xbt_test_add("Generic multicache CRASH test"); + xbt_test_log + (" 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); @@ -1332,7 +1379,7 @@ XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") for (i = 0; i < NB_TEST; i++) { mdict = xbt_dict_new(); - VERB1("mdict=%p", mdict); + XBT_VERB("mdict=%p", mdict); if (verbose > 0) printf("Test %d\n", i); /* else if (i%10) printf("."); else printf("%d",i/10); */ @@ -1359,7 +1406,7 @@ XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") data = xbt_multidict_get(mdict, keys); - xbt_test_assert2(data && !strcmp((char *) data, key), + xbt_test_assert(data && !strcmp((char *) data, key), "Retrieved value (%s) does not match the given one (%s)\n", (char *) data, key); } @@ -1375,4 +1422,4 @@ XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") xbt_dynar_free(&keys); } -#endif /* SIMGRID_TEST */ +#endif /* SIMGRID_TEST */