/* dict - a generic dictionary, variation over hash table */
-/* Copyright (c) 2004-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2019. 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 <string.h>
-#include <stdio.h>
-
#include "xbt/dict.h"
+#include "dict_private.h"
+#include "simgrid/Exception.hpp"
+#include "src/xbt_modinter.h"
#include "xbt/ex.h"
-#include <xbt/ex.hpp>
#include "xbt/log.h"
#include "xbt/mallocator.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 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;
+#include <cstdio>
+#include <cstring>
- return dict;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
/**
- * \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()
+ * @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_free()
*
* Creates and initialize a new dictionary with a default hashtable size.
* The dictionary is homogeneous: each element share the same free function.
dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1);
dict->count = 0;
dict->fill = 0;
- dict->homogeneous = 1;
return dict;
}
/**
- * \brief Destructor
- * \param dict the dictionary to be freed
+ * @brief Destructor
+ * @param dict the dictionary to be freed
*
* Frees a dictionary with all the data
*/
void xbt_dict_free(xbt_dict_t * dict)
{
- xbt_dictelm_t current;
- xbt_dictelm_t previous;
- int table_size;
- xbt_dictelm_t *table;
-
- // if ( *dict ) xbt_dict_dump_sizes(*dict);
-
if (dict != nullptr && *dict != nullptr) {
- table_size = (*dict)->table_size;
- table = (*dict)->table;
+ int table_size = (*dict)->table_size;
+ xbt_dictelm_t* table = (*dict)->table;
/* Warning: the size of the table is 'table_size+1'...
* This is because table_size is used as a binary mask in xbt_dict_rehash */
for (int i = 0; (*dict)->count && i <= table_size; i++) {
- current = table[i];
+ xbt_dictelm_t current = table[i];
+ xbt_dictelm_t previous;
+
while (current != nullptr) {
previous = current;
current = current->next;
xbt_dictelm_t *currcell = (xbt_dictelm_t *) xbt_realloc((char *) dict->table, newsize * sizeof(xbt_dictelm_t));
memset(&currcell[oldsize], 0, oldsize * sizeof(xbt_dictelm_t)); /* zero second half */
- dict->table_size = --newsize;
+ 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) /* empty cell */
+ if (*currcell == nullptr) /* empty cell */
continue;
xbt_dictelm_t *twincell = currcell + oldsize;
if ((bucklet->hash_code & newsize) != i) { /* Move to b */
*pprev = bucklet->next;
bucklet->next = *twincell;
- if (!*twincell)
+ if (*twincell == nullptr)
dict->fill++;
*twincell = bucklet;
} else {
}
}
- if (!*currcell) /* everything moved */
+ if (*currcell == nullptr) /* everything moved */
dict->fill--;
}
}
/**
- * \brief Add data to the dict (arbitrary key)
- * \param dict the container
- * \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()
+ * @brief Add data to the dict (arbitrary key)
+ * @param dict the container
+ * @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 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.
+ * 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(!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];
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);
}
}
/**
- * \brief Add data to the dict (null-terminated key)
+ * @brief Add data to the dict (null-terminated key)
*
- * \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 dict the dict
+ * @param key the key to set the new data
+ * @param data the data to add in the dict
+ * @param free_ctn unused parameter (kept for compatibility)
*
- * set the \a data in the structure under the \a key, which is anull terminated string.
+ * set the @a data in the structure under the @a key, which is anull terminated string.
*/
void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t free_ctn)
{
}
/**
- * \brief Retrieve data from the dict (arbitrary key)
+ * @brief Retrieve data from the dict (arbitrary key)
*
- * \param dict the dealer of data
- * \param key the key to find data
- * \param key_len the size of the \a key
- * \return the data that we are looking for
+ * @param dict the dealer of data
+ * @param key the key to find data
+ * @param key_len the size of the @a key
+ * @return the data that we are looking for
*
- * Search the given \a key. Throws not_found_error when not found.
+ * Search the given @a key. Throws not_found_error when not found.
*/
void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len)
{
return nullptr;
}
-/** @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)
+ * @brief Retrieve data from the dict (null-terminated key)
*
- * \param dict the dealer of data
- * \param key the key to find data
- * \return the data that we are looking for
+ * @param dict the dealer of data
+ * @param key the key to find data
+ * @return the data that we are looking for
*
- * Search the given \a key. Throws not_found_error when not found.
+ * Search the given @a key. Throws not_found_error when not found.
* Check xbt_dict_get_or_null() for a version returning nullptr without exception when not found.
*/
void *xbt_dict_get(xbt_dict_t dict, const char *key)
}
/**
- * \brief Retrieve element from the dict (null-terminated key)
+ * @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
+ * @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.
+ * Search the given @a key. Throws not_found_error when not found.
* Check xbt_dict_get_or_null() for a version returning nullptr without exception when not found.
*/
xbt_dictelm_t xbt_dict_get_elm(xbt_dict_t dict, const char *key)
}
/**
- * \brief like xbt_dict_get(), but returning nullptr when not found
+ * @brief like xbt_dict_get(), but returning nullptr when not found
*/
void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key)
{
}
/**
- * \brief like xbt_dict_get_elm(), but returning nullptr when not found
+ * @brief like xbt_dict_get_elm(), but returning nullptr when not found
*/
xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *key)
{
}
/**
- * \brief Remove data from the dict (arbitrary key)
+ * @brief Remove data from the dict (arbitrary key)
*
- * \param dict the trash can
- * \param key the key of the data to be removed
- * \param key_len the size of the \a key
+ * @param dict the trash can
+ * @param key the key of the data to be removed
+ * @param key_len the size of the @a key
*
- * Remove the entry associated with the given \a key (throws not_found)
+ * Remove the entry associated with the given @a key (throws not_found)
*/
void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len)
{
}
}
- if (!dict->table[hash_code & dict->table_size])
+ if (not dict->table[hash_code & dict->table_size])
dict->fill--;
xbt_dictelm_free(dict, current);
}
/**
- * \brief Remove data from the dict (null-terminated key)
+ * @brief Remove data from the dict (null-terminated key)
*
- * \param dict the dict
- * \param key the key of the data to be removed
+ * @param dict the dict
+ * @param key the key of the data to be removed
*
- * Remove the entry associated with the given \a key
+ * Remove the entry associated with the given @a key
*/
void xbt_dict_remove(xbt_dict_t dict, const char *key)
{
}
/**
- * \brief Return the number of elements in the dict.
- * \param dict a dictionary
+ * @brief Return the number of elements in the dict.
+ * @param dict a dictionary
*/
int xbt_dict_length(xbt_dict_t dict)
{
return dict->count;
}
-/** @brief function to be used in xbt_dict_dump as long as the stored values are strings */
-void xbt_dict_dump_output_string(void *s)
-{
- fputs((char*) s, stdout);
-}
-
/**
- * \brief test if the dict is empty or not
+ * @brief test if the dict is empty or not
*/
int xbt_dict_is_empty(xbt_dict_t dict)
{
- return !dict || (xbt_dict_length(dict) == 0);
+ return not dict || (xbt_dict_length(dict) == 0);
}
/**
- * \brief Outputs the content of the structure (debugging purpose)
+ * @brief Outputs the content of the structure (debugging purpose)
*
- * \param dict the exibitionist
- * \param output a function to dump each data in the tree (check @ref xbt_dict_dump_output_string)
+ * @param dict the exibitionist
+ * @param output a function to dump each data in the tree
*
- * Outputs the content of the structure. (for debugging purpose). \a output is a function to output the data. If nullptr,
- * data won't be displayed.
+ * Outputs the content of the structure. (for debugging purpose).
+ * @a output is a function to output the data. If nullptr, data won't be displayed.
*/
void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output)
{
- int i;
xbt_dictelm_t element;
printf("Dict %p:\n", dict);
if (dict != nullptr) {
- for (i = 0; i < dict->table_size; i++) {
+ for (int i = 0; i < dict->table_size; i++) {
element = dict->table[i];
if (element) {
printf("[\n");
}
}
-xbt_dynar_t all_sizes = nullptr;
-/** @brief shows some debugging info about the bucklet repartition */
-void xbt_dict_dump_sizes(xbt_dict_t dict)
-{
- unsigned int count;
- unsigned int size;
-
- printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, dict->fill, dict->table_size);
-
- if (!dict) {
- printf("\n");
- return;
- }
- xbt_dynar_t sizes = xbt_dynar_new(sizeof(int), nullptr);
-
- for (int i = 0; i < dict->table_size; i++) {
- xbt_dictelm_t element = dict->table[i];
- size = 0;
- if (element) {
- while (element != nullptr) {
- size++;
- element = element->next;
- }
- }
- if (xbt_dynar_length(sizes) <= size) {
- int prevsize = 1;
- xbt_dynar_set(sizes, size, &prevsize);
- } else {
- int prevsize;
- xbt_dynar_get_cpy(sizes, size, &prevsize);
- prevsize++;
- xbt_dynar_set(sizes, size, &prevsize);
- }
- }
- if (!all_sizes)
- all_sizes = xbt_dynar_new(sizeof(int), nullptr);
-
- xbt_dynar_foreach(sizes, count, size) {
- /* Copy values of this one into all_sizes */
- int prevcount;
- if (xbt_dynar_length(all_sizes) <= count) {
- prevcount = size;
- xbt_dynar_set(all_sizes, count, &prevcount);
- } else {
- xbt_dynar_get_cpy(all_sizes, count, &prevcount);
- prevcount += size;
- xbt_dynar_set(all_sizes, count, &prevcount);
- }
-
- /* Report current sizes */
- if (count != 0 && size != 0)
- printf("%uelm x %u cells; ", count, size);
- }
- printf("\n");
- xbt_dynar_free(&sizes);
-}
-
/**
* Create the dict mallocators.
* This is an internal XBT function called during the lib initialization.
xbt_mallocator_free(dict_elm_mallocator);
dict_elm_mallocator = nullptr;
}
- if (all_sizes) {
- unsigned int count;
- int size;
- double avg = 0;
- int total_count = 0;
- printf("Overall stats:");
- xbt_dynar_foreach(all_sizes, count, size) {
- if (count != 0 && size != 0) {
- printf("%uelm x %d cells; ", count, size);
- avg += count * size;
- total_count += size;
- }
- }
- printf("; %f elm per cell\n", avg / (double) total_count);
- }
}
#ifdef SIMGRID_TEST
-#include <time.h>
+#include "simgrid/Exception.hpp"
+#include "src/internal_config.h"
#include "xbt.h"
#include "xbt/ex.h"
-#include <xbt/ex.hpp>
-#include "src/internal_config.h"
+#include <ctime>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
xbt_dict_set(head, key, data, nullptr);
if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
- xbt_dict_dump(head, (void (*)(void *)) &printf);
+ xbt_dict_dump(head, [](void* s) { fputs((char*)s, stdout); });
fflush(stdout);
}
}
debugged_add_ext(head, key, key);
}
-static xbt_dict_t new_fixture(void)
+static xbt_dict_t new_fixture()
{
xbt_test_add("Fill in the dictionnary");
if (data) {
xbt_test_assert(found, "data do not match expectations: found nullptr 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);
+ xbt_test_assert(not 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 nullptr", found);
+ xbt_test_assert(not found, "data do not match expectations: found %s while searching for nullptr", found);
}
}
{
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)
int i = 0;
xbt_dict_foreach(head, cursor, key, data) {
- if (!key || !data || strcmp(key, data)) {
+ if (not key || not data || strcmp(key, data)) {
xbt_test_log("Seen #%d: %s->%s", ++i, key, data);
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
- xbt_test_assert(!data || !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);
}
}
xbt_dict_foreach(dict, cursor, key, data) {
effective++;
char* key2 = xbt_dict_get_key(dict, data);
- xbt_assert(!strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
+ xbt_assert(not strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
}
xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
/* RETRIEVE */
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
- xbt_test_assert(data);
- xbt_test_assert(!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");
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);
char* data;
xbt_dict_foreach(head, cursor, key, data) {
- if (!key || !data || strcmp(key, data)) {
+ if (not key || not data || strcmp(key, data)) {
xbt_test_log("Seen: %s->%s", key, data);
} else {
xbt_test_log("Seen: %s", key);
}
- if (!strcmp(key, "null"))
+ if (key && strcmp(key, "null") == 0)
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
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);
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);
xbt_dict_set(head, key, key, nullptr);
data = (char*) xbt_dict_get(head, key);
- xbt_test_assert(!strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
+ xbt_test_assert(not strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
count(head, j + 1);
}
- /* xbt_dict_dump(head,(void (*)(void*))&printf); */
traverse(head);
xbt_dict_free(&head);
xbt_dict_free(&head);
xbt_dict_t head = xbt_dict_new_homogeneous(&free);
xbt_test_add("Fill %d elements, with keys being the number of element", NB_ELM);
for (int j = 0; j < NB_ELM; j++) {
- /* if (!(j%1000)) { printf("."); fflush(stdout); } */
char* key = (char*)xbt_malloc(10);
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));
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);
- xbt_test_assert(!strcmp(key, (char *) data), "with get, key=%s != data=%s", key, (char *) data);
+ xbt_test_assert(not strcmp(key, (char*)data), "with get, key=%s != data=%s", key, (char*)data);
data = xbt_dict_get_ext(head, key, strlen(key));
- xbt_test_assert(!strcmp(key, (char *) data), "with get_ext, key=%s != data=%s", key, (char *) data);
+ xbt_test_assert(not strcmp(key, (char*)data), "with get_ext, key=%s != data=%s", key, (char*)data);
}
}
free(key);
xbt_test_add("Remove my %d elements", NB_ELM);
key = (char*) xbt_malloc(10);
for (int j = 0; j < NB_ELM; j++) {
- /* if (!(j%10000)) printf("."); fflush(stdout); */
snprintf(key,10, "%d", j);
xbt_dict_remove(head, key);
}