X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5657b6cbb51a403dbc777e905664dc17ec49f327..e9ee90930ac32f25f8436935324f4f7a25a72271:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index d39a7280a7..3984e4315c 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,20 +1,18 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2011. The SimGrid Team. +/* Copyright (c) 2004-2013. 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. */ -#define DJB2_HASH_FUNCTION -//#define FNV_HASH_FUNCTION - #include #include #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/mallocator.h" #include "xbt_modinter.h" +#include "xbt/str.h" #include "dict_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, @@ -105,85 +103,6 @@ XBT_INLINE unsigned int xbt_dict_size(xbt_dict_t dict) 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) -{ - - -#ifdef DJB2_HASH_FUNCTION - /* fast implementation of djb2 algorithm */ - int c; - register unsigned int hash = 5381; - - while (str_len--) { - c = *str++; - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ - } -# elif defined(FNV_HASH_FUNCTION) - register unsigned int hash = 0x811c9dc5; - unsigned char *bp = (unsigned char *) str; /* start of buffer */ - unsigned char *be = bp + str_len; /* beyond end of buffer */ - - 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); - - /* xor the bottom with the current octet */ - hash ^= (unsigned int) *bp++; - } - -# else - register unsigned int hash = 0; - - while (str_len--) { - hash += (*str) * (*str); - str++; - } -#endif - - return hash; -} - -static XBT_INLINE unsigned int xbt_dict_hash(const char *str) -{ -#ifdef DJB2_HASH_FUNCTION - /* fast implementation of djb2 algorithm */ - int c; - register unsigned int hash = 5381; - - while ((c = *str++)) { - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ - } - -# elif defined(FNV_HASH_FUNCTION) - register unsigned int hash = 0x811c9dc5; - - while (*str) { - /* multiply by the 32 bit FNV magic prime mod 2^32 */ - hash += - (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + - (hash << 24); - - /* xor the bottom with the current byte */ - hash ^= (unsigned int) *str++; - } - -# else - register unsigned int hash = 0; - - while (*str) { - hash += (*str) * (*str); - str++; - } -#endif - return hash; -} - /* Expend the size of the dict */ static void xbt_dict_rehash(xbt_dict_t dict) { @@ -247,13 +166,14 @@ XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict, void *data, void_f_pvoid_t free_ctn) { - unsigned int hash_code = xbt_dict_hash_ext(key, key_len); + unsigned int hash_code = xbt_str_hash_ext(key, key_len); 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 @@ -275,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); } @@ -318,7 +238,7 @@ XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, { - unsigned int hash_code = xbt_dict_hash_ext(key, key_len); + unsigned int hash_code = xbt_str_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); @@ -343,7 +263,7 @@ 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); + unsigned int hash_code = xbt_str_hash_ext(key, key_len); xbt_dictelm_t current; xbt_assert(dict); @@ -397,21 +317,27 @@ 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_dict_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; } /** @@ -419,7 +345,19 @@ XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key) */ XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key) { - unsigned int hash_code = xbt_dict_hash(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; xbt_assert(dict); @@ -428,11 +366,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; } @@ -450,7 +384,7 @@ XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, { - unsigned int hash_code = xbt_dict_hash_ext(key, key_len); + unsigned int hash_code = xbt_str_hash_ext(key, key_len); xbt_dictelm_t current, previous = NULL; xbt_assert(dict); @@ -689,12 +623,6 @@ void xbt_dict_dump_sizes(xbt_dict_t dict) */ void xbt_dict_preinit(void) { - 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_elm_mallocator); - xbt_mallocator_free(dict_het_elm_mallocator); - } - dict_elm_mallocator = xbt_mallocator_new(256, dict_elm_mallocator_new_f, dict_elm_mallocator_free_f, @@ -745,11 +673,6 @@ 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) { @@ -791,19 +714,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)