X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index f52f98bf08..b48640365f 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-2011. 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,7 +11,7 @@ #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" @@ -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, @@ -171,8 +171,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 +195,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); } @@ -303,6 +304,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) * @@ -316,27 +326,45 @@ char *xbt_dict_get_key(xbt_dict_t dict, const void *data) */ XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *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))) - current = current->next; + 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); if (current == NULL) THROWF(not_found_error, 0, "key %s not found", key); - return current->content; + 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) + return NULL; + + 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) { unsigned int hash_code = xbt_str_hash(key); xbt_dictelm_t current; @@ -347,11 +375,7 @@ XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key))) current = current->next; - - if (current == NULL) - return NULL; - - return current->content; + return current; } @@ -654,15 +678,12 @@ void xbt_dict_postexit(void) #include "xbt/ex.h" #include "portable.h" +#define PRINTF_STR(a) (a)?:"(null)" + 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, void_f_pvoid_t free_f) { @@ -704,19 +725,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) @@ -798,7 +824,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; @@ -868,19 +894,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"); @@ -1148,4 +1174,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 */