X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04a3cb0c60db77d81325fe54e6260673ed22a074..48346cdb47073af6a650e37405c0697ddbdb63e7:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 4dc99bb086..b7c5b5729b 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,6 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2011. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -19,20 +19,11 @@ 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); - - -/*####[ Code ]###############################################################*/ /** * \brief Constructor * \return pointer to the destination - * \see xbt_dict_new_ext(), xbt_dict_free() + * \see xbt_dict_free() * * Creates and initialize a new dictionary with a default hashtable size. */ @@ -40,7 +31,7 @@ xbt_dict_t xbt_dict_new(void) { xbt_dict_t dict; - dict = xbt_mallocator_get(dict_mallocator); + dict = xbt_new(s_xbt_dict_t, 1); dict->table_size = 127; dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1); dict->count = 0; @@ -79,7 +70,7 @@ void xbt_dict_free(xbt_dict_t * dict) } } xbt_free(table); - xbt_mallocator_release(dict_mallocator, *dict); + xbt_free(*dict); *dict = NULL; } } @@ -188,7 +179,7 @@ static void xbt_dict_rehash(xbt_dict_t dict) 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 */ @@ -223,8 +214,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. @@ -239,7 +230,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 && @@ -263,7 +254,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 */ @@ -281,8 +272,8 @@ 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. @@ -323,7 +314,7 @@ XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, } 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; } @@ -401,7 +392,7 @@ XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key) current = current->next; if (current == NULL) - THROW1(not_found_error, 0, "key %s not found", key); + THROWF(not_found_error, 0, "key %s not found", key); return current->content; } @@ -457,7 +448,7 @@ XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, } 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; @@ -506,7 +497,7 @@ XBT_INLINE void xbt_dicti_set(xbt_dict_t dict, xbt_dictelm_t current, previous = NULL; xbt_assert(dict); - DEBUG5("ADD %zu->%zu; hash = %d, size = %d, & = %d", key, data, + 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 && @@ -591,7 +582,7 @@ XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) } if (current == NULL) - THROW1(not_found_error, 0, "key %zu not found", key); + THROWF(not_found_error, 0, "key %zu not found", key); if (previous != NULL) { previous->next = current->next; @@ -658,7 +649,7 @@ void xbt_dict_dump_output_string(void *s) */ XBT_INLINE int xbt_dict_is_empty(xbt_dict_t dict) { - return (xbt_dict_size(dict) == 0); + return !dict || (xbt_dict_length(dict) == 0); } /** @@ -684,7 +675,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; @@ -764,16 +755,11 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) */ void xbt_dict_preinit(void) { - if (dict_mallocator != NULL) { + if (dict_elm_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, @@ -786,9 +772,7 @@ void xbt_dict_preinit(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; } @@ -811,23 +795,6 @@ void xbt_dict_postexit(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" @@ -848,7 +815,7 @@ 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), + xbt_test_log("Add %s under %s", PRINTF_STR(data_to_fill), PRINTF_STR(key)); xbt_dict_set(head, key, data, &free); @@ -865,7 +832,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"); @@ -884,15 +851,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); } @@ -905,7 +872,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); */ } @@ -920,12 +887,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); } } @@ -935,19 +902,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, + THROWF(unknown_error, 0, "Found something which shouldn't be there (%s)", data); - } CATCH(e) { + } + 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) @@ -958,15 +926,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++; - xbt_test_assert2(effective == length, "Effective length(%d) != %d.", + xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length); } @@ -974,27 +942,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 + xbt_test_add ("Count elements (expecting %d), and test the getkey function", length); - xbt_test_assert2(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++; key2 = xbt_dict_get_key(dict, data); - xbt_assert2(!strcmp(key, key2), + 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); } @@ -1006,22 +975,23 @@ char *data; 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 { 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"); + xbt_test_add("Traverse the full dictionary"); fill(&head); count_check_get_key(head, 7); @@ -1032,34 +1002,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)); @@ -1075,16 +1045,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); } @@ -1092,7 +1062,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"); } @@ -1105,7 +1075,7 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") xbt_dict_free(&head); - xbt_test_add0 + xbt_test_add ("Remove each data manually (traversing the resulting dictionary each time)"); fill(&head); debuged_remove(head, "12a"); @@ -1145,7 +1115,7 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") } traverse(head); - xbt_test_add0 + xbt_test_add ("Free dict, create new fresh one, and then reset the dict"); xbt_dict_free(&head); fill(&head); @@ -1153,7 +1123,7 @@ XBT_TEST_UNIT("remove", test_dict_remove, "Removing some values") 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); } @@ -1162,11 +1132,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; @@ -1174,15 +1144,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); @@ -1191,7 +1161,7 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management") static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) { uintptr_t stored_data = 0; - xbt_test_log2("Add %zu under %zu", data, key); + 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)) { @@ -1199,14 +1169,14 @@ static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) fflush(stdout); } stored_data = xbt_dicti_get(head, key); - xbt_test_assert3(stored_data == data, + 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); @@ -1248,22 +1218,21 @@ 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 + 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_log1 + 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); @@ -1278,7 +1247,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); @@ -1292,7 +1261,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); } */ @@ -1304,12 +1273,12 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") } /*xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add0 + 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); */ @@ -1317,17 +1286,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), + 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); */ @@ -1338,7 +1307,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); } @@ -1366,8 +1335,8 @@ XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test") char *key; - xbt_test_add0("Generic multicache CRASH test"); - xbt_test_log4 + 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); @@ -1379,7 +1348,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); */ @@ -1406,7 +1375,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); }