X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..497fca3a1ed069a2b601b91738aca0169a07d881:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 84e27cdfaa..95bda63f08 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-2013. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,17 +11,17 @@ #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/mallocator.h" -#include "xbt_modinter.h" +#include "src/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"); + "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 @@ -107,12 +107,12 @@ XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) static void xbt_dict_rehash(xbt_dict_t dict) { const int oldsize = dict->table_size + 1; - register int newsize = oldsize * 2; - register int i; - register xbt_dictelm_t *currcell; - register xbt_dictelm_t *twincell; - register xbt_dictelm_t bucklet; - register xbt_dictelm_t *pprev; + int newsize = oldsize * 2; + int i; + xbt_dictelm_t *currcell; + xbt_dictelm_t *twincell; + xbt_dictelm_t bucklet; + xbt_dictelm_t *pprev; currcell = (xbt_dictelm_t *) xbt_realloc((char *) dict->table, @@ -156,7 +156,9 @@ static void xbt_dict_rehash(xbt_dict_t dict) * \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 + * \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. @@ -171,8 +173,9 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, xbt_dictelm_t current, previous = NULL; xbt_assert(dict); - XBT_DEBUG("ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code, - dict->table_size, hash_code & dict->table_size); + 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 @@ -194,9 +197,9 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, previous->next = current; } } else { - XBT_DEBUG("Replace %.*s by %.*s under key %.*s", - key_len, (char *) current->content, - key_len, (char *) data, key_len, (char *) key); + XBT_CDEBUG(xbt_dict, "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 */ xbt_dictelm_set_data(dict, current, data, free_ctn); } @@ -209,7 +212,9 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t 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 + * \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. @@ -303,6 +308,15 @@ char *xbt_dict_get_key(xbt_dict_t dict, const void *data) return NULL; } +/** + * @brief retrieve the key associated to that xbt_dictelm_t. + * + */ +char *xbt_dict_get_elm_key(xbt_dictelm_t elm) +{ + return elm->key; +} + /** * \brief Retrieve data from the dict (null-terminated key) * @@ -345,7 +359,7 @@ XBT_INLINE xbt_dictelm_t xbt_dict_get_elm(xbt_dict_t dict, const char *key) 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) return NULL; @@ -666,7 +680,9 @@ void xbt_dict_postexit(void) #ifdef SIMGRID_TEST #include "xbt.h" #include "xbt/ex.h" -#include "portable.h" +#include "src/portable.h" + +#define PRINTF_STR(a) (a)?:"(null)" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); @@ -713,19 +729,24 @@ static void fill(xbt_dict_t * head, int homogeneous) static void search_ext(xbt_dict_t head, const char *key, const char *data) { - void *found; + char *found; xbt_test_add("Search %s", key); found = xbt_dict_get(head, key); - xbt_test_log("Found %s", (char *) found); - if (data) + xbt_test_log("Found %s", 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); + "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", + 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) @@ -807,7 +828,7 @@ static void count_check_get_key(xbt_dict_t dict, int length) { xbt_dict_cursor_t cursor; char *key; - _XBT_GNUC_UNUSED char *key2; + XBT_ATTRIB_UNUSED char *key2; void *data; int effective = 0; @@ -877,19 +898,19 @@ static void basic_test(int homogeneous) fill(&head, homogeneous); count_check_get_key(head, 7); xbt_test_add("Change 123 to 'Changed 123'"); - xbt_dict_set(head, "123", strdup("Changed 123"), free_f); + xbt_dict_set(head, "123", xbt_strdup("Changed 123"), free_f); count_check_get_key(head, 7); xbt_test_add("Change 123 back to '123'"); - xbt_dict_set(head, "123", strdup("123"), free_f); + xbt_dict_set(head, "123", xbt_strdup("123"), free_f); count_check_get_key(head, 7); xbt_test_add("Change 12a to 'Dummy 12a'"); - xbt_dict_set(head, "12a", strdup("Dummy 12a"), free_f); + xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), free_f); count_check_get_key(head, 7); xbt_test_add("Change 12a to '12a'"); - xbt_dict_set(head, "12a", strdup("12a"), free_f); + xbt_dict_set(head, "12a", xbt_strdup("12a"), free_f); count_check_get_key(head, 7); xbt_test_add("Traverse the resulting dictionary"); @@ -1157,4 +1178,27 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") xbt_dict_free(&head); } +XBT_TEST_UNIT("ext", test_dict_int, "Test dictionnary with int keys") +{ + xbt_dict_t dict = xbt_dict_new(); + int count = 500; + + xbt_test_add("Insert elements"); + 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_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_add("Free the array"); + xbt_dict_free(&dict); +} + #endif /* SIMGRID_TEST */