X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/268fb240b28aeba1e066b2163cad6ba0016e545f..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/dict.cpp diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp index 5f53f43d2c..2dec54d96b 100644 --- a/src/xbt/dict.cpp +++ b/src/xbt/dict.cpp @@ -1,13 +1,13 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2017. The SimGrid Team. +/* Copyright (c) 2004-2018. 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. */ -#include -#include +#include +#include #include "xbt/dict.h" #include "xbt/ex.h" @@ -20,28 +20,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables"); -/** - * \brief Constructor - * \return pointer to the destination - * \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 function. - */ -xbt_dict_t xbt_dict_new() -{ - XBT_WARN("Function xbt_dict_new() will soon be dropped. Please switch to xbt_dict_new_homogeneous()"); - xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr); - dict->homogeneous = 0; - - return dict; -} - /** * \brief Constructor * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary * \return pointer to the destination - * \see xbt_dict_new(), xbt_dict_free() + * \see xbt_dict_free() * * Creates and initialize a new dictionary with a default hashtable size. * The dictionary is homogeneous: each element share the same free function. @@ -59,7 +42,6 @@ xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn) dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1); dict->count = 0; dict->fill = 0; - dict->homogeneous = 1; return dict; } @@ -111,7 +93,7 @@ static void xbt_dict_rehash(xbt_dict_t dict) newsize--; dict->table_size = newsize; dict->table = currcell; - XBT_DEBUG("REHASH (%d->%d)", oldsize, newsize); + XBT_DEBUG("REHASH (%u->%u)", oldsize, newsize); for (unsigned i = 0; i < oldsize; i++, currcell++) { if (*currcell == nullptr) /* empty cell */ @@ -146,20 +128,19 @@ 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 data as argument) when \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() + * \param free_ctn unused parameter (kept for compatibility) * * 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. */ -void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, void_f_pvoid_t free_ctn) +void xbt_dict_set_ext(xbt_dict_t dict, const char* key, int key_len, void* data, + XBT_ATTRIB_UNUSED void_f_pvoid_t free_ctn) { unsigned int hash_code = xbt_str_hash_ext(key, key_len); xbt_dictelm_t current; xbt_dictelm_t previous = nullptr; - xbt_assert(not free_ctn, "Cannot set an individual free function in homogeneous dicts."); 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]; @@ -185,7 +166,7 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, 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); + xbt_dictelm_set_data(dict, current, data); } } @@ -195,8 +176,7 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, * \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 data as argument) when \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() + * \param free_ctn unused parameter (kept for compatibility) * * set the \a data in the structure under the \a key, which is anull terminated string. */ @@ -562,11 +542,11 @@ void xbt_dict_postexit() } #ifdef SIMGRID_TEST -#include +#include "src/internal_config.h" #include "xbt.h" #include "xbt/ex.h" +#include #include -#include "src/internal_config.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); @@ -630,7 +610,6 @@ static void debugged_remove(xbt_dict_t head, const char* key) { xbt_test_add("Remove '%s'", key); xbt_dict_remove(head, key); - /* xbt_dict_dump(head,(void (*)(void*))&printf); */ } static void traverse(xbt_dict_t head) @@ -646,7 +625,7 @@ static void traverse(xbt_dict_t head) } else { xbt_test_log("Seen #%d: %s", ++i, key); } - xbt_test_assert(not data || not strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data); + xbt_test_assert(key && data && strcmp(key, data) == 0, "Key(%s) != value(%s). Aborting", key, data); } } @@ -758,8 +737,7 @@ XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and trave /* RETRIEVE */ xbt_test_add("Search 123"); char* data = (char*)xbt_dict_get(head, "123"); - xbt_test_assert(data); - xbt_test_assert(not strcmp("123", data)); + xbt_test_assert(data && strcmp("123", data) == 0); search_not_found(head, "Can't be found"); search_not_found(head, "123 Can't be found"); @@ -775,8 +753,6 @@ XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and trave xbt_test_add("Traverse the resulting dictionary"); traverse(head); - /* xbt_dict_dump(head,(void (*)(void*))&printf); */ - xbt_test_add("Free the dictionary twice"); xbt_dict_free(&head); xbt_dict_free(&head); @@ -872,7 +848,7 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management") xbt_test_log("Seen: %s", key); } - if (not strcmp(key, "null")) + if (key && strcmp(key, "null") == 0) found = 1; } xbt_test_assert(found, "the key 'null', associated to nullptr is not found"); @@ -904,7 +880,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") 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); xbt_dict_t head = xbt_dict_new_homogeneous(free); - /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ for (int j = 0; j < 1000; j++) { char* data = nullptr; char* key = (char*)xbt_malloc(SIZEOFKEY); @@ -913,7 +888,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") for (int k = 0; k < SIZEOFKEY - 1; k++) key[k] = rand() % ('z' - 'a') + 'a'; key[SIZEOFKEY - 1] = '\0'; - /* printf("[%d %s]\n",j,key); */ data = (char*) xbt_dict_get_or_null(head, key); } while (data != nullptr); @@ -923,7 +897,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") count(head, j + 1); } - /* xbt_dict_dump(head,(void (*)(void*))&printf); */ traverse(head); xbt_dict_free(&head); xbt_dict_free(&head); @@ -937,7 +910,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") snprintf(key,10, "%d", j); xbt_dict_set(head, key, key, nullptr); } - /*xbt_dict_dump(head,(void (*)(void*))&printf); */ xbt_test_add("Count the elements (retrieving the key and data for each)"); xbt_test_log("There is %d elements", countelems(head)); @@ -945,7 +917,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test") xbt_test_add("Search my %d elements 20 times", NB_ELM); char* key = (char*)xbt_malloc(10); for (int i = 0; i < 20; i++) { - /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */ for (int j = 0; j < NB_ELM; j++) { snprintf(key,10, "%d", j); void* data = xbt_dict_get(head, key);