/* 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"
+#include "xbt/string.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
+#include <cstdio>
+#include <cstring>
-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;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
- return dict;
-}
+constexpr int MAX_FILL_PERCENT = 80;
/**
- * \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
*/
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 */
}
/**
- * \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(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];
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 std::out_of_range when not found.
*/
void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len)
{
}
if (current == nullptr)
- THROWF(not_found_error, 0, "key %.*s not found", key_len, key);
+ throw std::out_of_range(simgrid::xbt::string_printf("key %.*s not found", key_len, key));
return current->content;
}
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 std::out_of_range 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 std::out_of_range 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)
xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key);
if (current == nullptr)
- THROWF(not_found_error, 0, "key %s not found", key);
+ throw std::out_of_range(simgrid::xbt::string_printf("key %s not found", key));
return current;
}
/**
- * \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 std::out_of_range)
*/
void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len)
{
}
if (current == nullptr)
- THROWF(not_found_error, 0, "key %.*s not found", key_len, key);
+ throw std::out_of_range(simgrid::xbt::string_printf("key %.*s not found", key_len, key));
else {
if (previous != nullptr) {
previous->next = current->next;
}
/**
- * \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 not dict || (xbt_dict_length(dict) == 0);
}
-/**
- * \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)
- *
- * 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)
-{
- xbt_dictelm_t element;
- printf("Dict %p:\n", dict);
- if (dict != nullptr) {
- for (int i = 0; i < dict->table_size; i++) {
- element = dict->table[i];
- if (element) {
- printf("[\n");
- while (element != nullptr) {
- printf(" %s -> '", element->key);
- if (output != nullptr) {
- output(element->content);
- }
- printf("'\n");
- element = element->next;
- }
- printf("]\n");
- } else {
- 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 (not 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 (not 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;
- }
- }
- if (total_count > 0)
- printf("; %f elm per cell\n", avg / (double)total_count);
- else
- printf("; 0 elm per cell\n");
- }
-}
-
-#ifdef SIMGRID_TEST
-#include <time.h>
-#include "xbt.h"
-#include "xbt/ex.h"
-#include <xbt/ex.hpp>
-#include "src/internal_config.h"
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
-
-XBT_TEST_SUITE("dict", "Dict data container");
-
-static void debugged_add_ext(xbt_dict_t head, const char* key, const char* data_to_fill)
-{
- char *data = xbt_strdup(data_to_fill);
-
- xbt_test_log("Add %s under %s", data_to_fill, key);
-
- xbt_dict_set(head, key, data, nullptr);
- if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
- xbt_dict_dump(head, (void (*)(void *)) &printf);
- fflush(stdout);
- }
-}
-
-static void debugged_add(xbt_dict_t head, const char* key)
-{
- debugged_add_ext(head, key, key);
-}
-
-static xbt_dict_t new_fixture()
-{
- xbt_test_add("Fill in the dictionnary");
-
- xbt_dict_t head = xbt_dict_new_homogeneous(&free);
- debugged_add(head, "12");
- debugged_add(head, "12a");
- debugged_add(head, "12b");
- debugged_add(head, "123");
- debugged_add(head, "123456");
- debugged_add(head, "1234");
- debugged_add(head, "123457");
-
- return head;
-}
-
-static void search_ext(xbt_dict_t head, const char *key, const char *data)
-{
- xbt_test_add("Search %s", key);
- char *found = (char*) xbt_dict_get(head, key);
- xbt_test_log("Found %s", found);
- if (data) {
- xbt_test_assert(found, "data do not match expectations: found nullptr while searching for %s", data);
- if (found)
- xbt_test_assert(not strcmp(data, found), "data do not match expectations: found %s while searching for %s", found,
- data);
- } else {
- xbt_test_assert(not found, "data do not match expectations: found %s while searching for nullptr", found);
- }
-}
-
-static void search(xbt_dict_t head, const char *key)
-{
- search_ext(head, key, key);
-}
-
-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)
-{
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- char *data;
- int i = 0;
-
- xbt_dict_foreach(head, cursor, 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(not data || not strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data);
- }
-}
-
-static void search_not_found(xbt_dict_t head, const char *data)
-{
- int ok = 0;
- xbt_test_add("Search %s (expected not to be found)", data);
-
- try {
- data = (const char*) xbt_dict_get(head, data);
- THROWF(unknown_error, 0, "Found something which shouldn't be there (%s)", data);
- }
- catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- ok = 1;
- }
- xbt_test_assert(ok, "Exception not raised");
-}
-
-static void count(xbt_dict_t dict, int length)
-{
- xbt_test_add("Count elements (expecting %d)", length);
- xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
-
- xbt_dict_cursor_t cursor;
- char *key;
- void *data;
- int effective = 0;
- xbt_dict_foreach(dict, cursor, key, data)
- effective++;
-
- xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
-}
-
-static void count_check_get_key(xbt_dict_t dict, int length)
-{
- xbt_dict_cursor_t cursor;
- char *key;
- void *data;
- int effective = 0;
-
- xbt_test_add("Count elements (expecting %d), and test the getkey function", length);
- xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
-
- xbt_dict_foreach(dict, cursor, key, data) {
- effective++;
- char* key2 = xbt_dict_get_key(dict, data);
- 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);
-}
-
-XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and traverse homogeneous dicts")
-{
- xbt_test_add("Traversal the null dictionary");
- traverse(nullptr);
-
- xbt_test_add("Traversal and search the empty dictionary");
- xbt_dict_t head = xbt_dict_new_homogeneous(&free);
- traverse(head);
- try {
- debugged_remove(head, "12346");
- }
- catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- }
- xbt_dict_free(&head);
-
- xbt_test_add("Traverse the full dictionary");
- head = new_fixture();
- count_check_get_key(head, 7);
-
- debugged_add_ext(head, "toto", "tutu");
- search_ext(head, "toto", "tutu");
- debugged_remove(head, "toto");
-
- search(head, "12a");
- traverse(head);
-
- xbt_test_add("Free the dictionary (twice)");
- xbt_dict_free(&head);
- xbt_dict_free(&head);
-
- /* CHANGING */
- head = new_fixture();
- count_check_get_key(head, 7);
- xbt_test_add("Change 123 to 'Changed 123'");
- xbt_dict_set(head, "123", xbt_strdup("Changed 123"), nullptr);
- count_check_get_key(head, 7);
-
- xbt_test_add("Change 123 back to '123'");
- xbt_dict_set(head, "123", xbt_strdup("123"), nullptr);
- count_check_get_key(head, 7);
-
- xbt_test_add("Change 12a to 'Dummy 12a'");
- xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), nullptr);
- count_check_get_key(head, 7);
-
- xbt_test_add("Change 12a to '12a'");
- xbt_dict_set(head, "12a", xbt_strdup("12a"), nullptr);
- count_check_get_key(head, 7);
-
- xbt_test_add("Traverse the resulting dictionary");
- traverse(head);
-
- /* 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));
-
- search_not_found(head, "Can't be found");
- search_not_found(head, "123 Can't be found");
- search_not_found(head, "12345678 NOT");
-
- search(head, "12a");
- search(head, "12b");
- search(head, "12");
- search(head, "123456");
- search(head, "1234");
- search(head, "123457");
-
- 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);
-
- xbt_test_add("Traverse the resulting dictionary");
- traverse(head);
-}
-
-XBT_TEST_UNIT("remove_homogeneous", test_dict_remove, "Removing some values from homogeneous dicts")
-{
- xbt_dict_t head = new_fixture();
- count(head, 7);
- xbt_test_add("Remove non existing data");
- try {
- debugged_remove(head, "Does not exist");
- }
- catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- }
- traverse(head);
-
- xbt_dict_free(&head);
-
- xbt_test_add("Remove each data manually (traversing the resulting dictionary each time)");
- head = new_fixture();
- debugged_remove(head, "12a");
- traverse(head);
- count(head, 6);
- debugged_remove(head, "12b");
- traverse(head);
- count(head, 5);
- debugged_remove(head, "12");
- traverse(head);
- count(head, 4);
- debugged_remove(head, "123456");
- traverse(head);
- count(head, 3);
- try {
- debugged_remove(head, "12346");
- }
- catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- traverse(head);
- }
- debugged_remove(head, "1234");
- traverse(head);
- debugged_remove(head, "123457");
- traverse(head);
- debugged_remove(head, "123");
- traverse(head);
- try {
- debugged_remove(head, "12346");
- }
- catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- }
- traverse(head);
-
- xbt_test_add("Free dict, create new fresh one, and then reset the dict");
- xbt_dict_free(&head);
- head = new_fixture();
- xbt_dict_reset(head);
- count(head, 0);
- traverse(head);
-
- xbt_test_add("Free the dictionary twice");
- xbt_dict_free(&head);
- xbt_dict_free(&head);
-}
-
-XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management")
-{
- xbt_dict_t head = new_fixture();
-
- xbt_test_add("Store nullptr under 'null'");
- xbt_dict_set(head, "null", nullptr, nullptr);
- search_ext(head, "null", nullptr);
-
- xbt_test_add("Check whether I see it while traversing...");
- {
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- int found = 0;
- char* data;
-
- xbt_dict_foreach(head, cursor, 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 (not strcmp(key, "null"))
- found = 1;
- }
- xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
- }
- xbt_dict_free(&head);
-}
-
-#define NB_ELM 20000
-#define SIZEOFKEY 1024
-static int countelems(xbt_dict_t head)
-{
- xbt_dict_cursor_t cursor;
- char *key;
- void *data;
- int res = 0;
-
- xbt_dict_foreach(head, cursor, key, data) {
- res++;
- }
- return res;
-}
-
-XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
-{
- srand((unsigned int) time(nullptr));
-
- for (int i = 0; i < 10; i++) {
- xbt_test_add("CRASH test number %d (%d to go)", i + 1, 10 - i - 1);
- 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);
-
- do {
- 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(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++) {
- 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(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(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++) {
- snprintf(key,10, "%d", j);
- xbt_dict_remove(head, key);
- }
- free(key);
-
- xbt_test_add("Free the object (twice)");
- xbt_dict_free(&head);
- xbt_dict_free(&head);
-}
-
-XBT_TEST_UNIT("ext", test_dict_int, "Test dictionnary with int keys")
-{
- xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr);
- int count = 500;
-
- xbt_test_add("Insert elements");
- for (int i = 0; i < count; ++i)
- xbt_dict_set_ext(dict, (char*) &i, sizeof(i), (void*) (intptr_t) i, nullptr);
- xbt_test_assert(xbt_dict_size(dict) == (unsigned) count, "Bad number of elements in the dictionnary");
-
- xbt_test_add("Check elements");
- for (int 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) == (unsigned) 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 */
