#include "xbt/str.h"
#include "dict_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
- "Dictionaries provide the same functionalities as hash tables");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
/**
* \brief Constructor
* \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.
+ * The dictionary is heterogeneous: each element can have a different free function.
*/
xbt_dict_t xbt_dict_new(void)
{
/**
* \brief Constructor
- * \param free_ctn function to call with (\a data as argument) when
- * \a data is removed from the dictionary
+ * \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()
*
}
}
-/**
- * Returns the amount of elements in the dict
- */
+/** Returns the amount of elements in the dict */
inline unsigned int xbt_dict_size(xbt_dict_t dict)
{
return (dict ? (unsigned int) dict->count : (unsigned int) 0);
xbt_dictelm_t bucklet;
xbt_dictelm_t *pprev;
- currcell =
- (xbt_dictelm_t *) xbt_realloc((char *) dict->table,
- newsize * sizeof(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;
dict->table = currcell;
continue;
twincell = currcell + oldsize;
for (pprev = currcell, bucklet = *currcell; bucklet; bucklet = *pprev) {
- /* Since we use "& size" instead of "%size" and since the size was doubled,
- each bucklet of this cell must either :
+ /* Since we use "& size" instead of "%size" and since the size was doubled, each bucklet of this cell must either:
- stay in cell i (ie, currcell)
- go to the cell i+oldsize (ie, twincell) */
if ((bucklet->hash_code & newsize) != i) { /* Move to b */
} else {
pprev = &bucklet->next;
}
-
}
if (!*currcell) /* everything moved */
* \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 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()
*
- * 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.
*/
-inline void xbt_dict_set_ext(xbt_dict_t dict,
- const char *key, int key_len,
- void *data, void_f_pvoid_t free_ctn)
+inline void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, void_f_pvoid_t free_ctn)
{
-
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
xbt_dictelm_t current, previous = NULL;
- XBT_CDEBUG(xbt_dict,
- "ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code,
+ 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
+ while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
|| memcmp(key, current->key, key_len))) {
previous = current;
current = current->next;
}
} else {
XBT_CDEBUG(xbt_dict, "Replace %.*s by %.*s under key %.*s",
- key_len, (char *) current->content,
- key_len, (char *) data, key_len, (char *) key);
+ 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);
}
* \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 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()
*
- * set the \a data in the structure under the \a key, which is a
- * null terminated string.
+ * set the \a data in the structure under the \a key, which is anull terminated string.
*/
-inline void xbt_dict_set(xbt_dict_t dict,
- const char *key, void *data,
- void_f_pvoid_t free_ctn)
+inline void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t free_ctn)
{
-
xbt_dict_set_ext(dict, key, strlen(key), data, free_ctn);
}
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- while (current != NULL &&
- (hash_code != current->hash_code || key_len != current->key_len
+ while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
|| memcmp(key, current->key, key_len))) {
current = current->next;
}
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- while (current != NULL &&
- (hash_code != current->hash_code || key_len != current->key_len
+ while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
|| memcmp(key, current->key, key_len))) {
current = current->next;
}
current = current->next;
}
}
-
return NULL;
}
* \return the data 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.
+ * Check xbt_dict_get_or_null() for a version returning NULL without exception when not found.
*/
inline void *xbt_dict_get(xbt_dict_t dict, const char *key)
{
return xbt_dict_get_elm(dict, key)->content;
}
+
/**
* \brief Retrieve element from the dict (null-terminated key)
*
* \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.
+ * Check xbt_dict_get_or_null() for a version returning NULL without exception when not found.
*/
inline xbt_dictelm_t xbt_dict_get_elm(xbt_dict_t dict, const char *key)
{
return current->content;
}
+
/**
* \brief like xbt_dict_get_elm(), but returning NULL when not found
*/
unsigned int hash_code = xbt_str_hash(key);
xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- while (current != NULL &&
- (hash_code != current->hash_code || strcmp(key, current->key)))
+ while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key)))
current = current->next;
return current;
}
-
/**
* \brief Remove data from the dict (arbitrary key)
*
xbt_dictelm_t previous = NULL;
xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- while (current != NULL &&
- (hash_code != current->hash_code || key_len != current->key_len
+ while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
|| strncmp(key, current->key, key_len))) {
previous = current; /* save the previous node */
current = current->next;
dict->count--;
}
-
-
/**
* \brief Remove data from the dict (null-terminated key)
*
* \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 NULL, data won't be displayed.
+ * Outputs the content of the structure. (for debugging purpose). \a output is a function to output the data. If NULL,
+ * data won't be displayed.
*/
-
void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output)
{
int i;
*/
void xbt_dict_preinit(void)
{
- dict_elm_mallocator = xbt_mallocator_new(256,
- dict_elm_mallocator_new_f,
- dict_elm_mallocator_free_f,
+ dict_elm_mallocator = xbt_mallocator_new(256, dict_elm_mallocator_new_f, dict_elm_mallocator_free_f,
dict_elm_mallocator_reset_f);
- dict_het_elm_mallocator = xbt_mallocator_new(256,
- dict_het_elm_mallocator_new_f,
- dict_het_elm_mallocator_free_f,
+ dict_het_elm_mallocator = xbt_mallocator_new(256, dict_het_elm_mallocator_new_f, dict_het_elm_mallocator_free_f,
dict_het_elm_mallocator_reset_f);
}
#include "xbt/ex.h"
#include "src/internal_config.h"
-
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
XBT_TEST_SUITE("dict", "Dict data container");
-static void debuged_add_ext(xbt_dict_t head, const char *key,
- const char *data_to_fill, void_f_pvoid_t free_f)
+static void debuged_add_ext(xbt_dict_t head, const char *key, const char *data_to_fill, void_f_pvoid_t free_f)
{
char *data = xbt_strdup(data_to_fill);
debuged_add(*head, "123457", free_f);
}
-
static void search_ext(xbt_dict_t head, const char *key, const char *data)
{
char *found;
found = xbt_dict_get(head, key);
xbt_test_log("Found %s", found);
if (data) {
- xbt_test_assert(found,
- "data do not match expectations: found NULL while searching for %s",
- data);
+ xbt_test_assert(found, "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",
+ 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);
+ xbt_test_assert(!found, "data do not match expectations: found %s while searching for NULL", found);
}
}
static void debuged_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 = NULL;
} 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(!data || !strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data);
}
}
TRY {
data = xbt_dict_get(head, data);
- THROWF(unknown_error, 0,
- "Found something which shouldn't be there (%s)", data);
- }
- CATCH(e) {
+ THROWF(unknown_error, 0, "Found something which shouldn't be there (%s)", data);
+ } CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
void *data;
int effective = 0;
-
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_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
xbt_dict_foreach(dict, cursor, key, data)
effective++;
- xbt_test_assert(effective == length, "Effective length(%d) != %d.",
- effective, length);
-
+ xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
}
static void count_check_get_key(xbt_dict_t dict, int length)
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_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++;
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(!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_assert(effective == length, "Effective length(%d) != %d.", effective, length);
}
xbt_ex_t e;
traverse(head);
TRY {
debuged_remove(head, "12346");
- }
- CATCH(e) {
+ } CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
xbt_test_add("Remove non existing data");
TRY {
debuged_remove(head, "Does not exist");
- }
- CATCH(e) {
+ } CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
xbt_dict_free(&head);
- xbt_test_add
- ("Remove each data manually (traversing the resulting dictionary each time)");
+ xbt_test_add("Remove each data manually (traversing the resulting dictionary each time)");
fill(&head, homogeneous);
debuged_remove(head, "12a");
traverse(head);
count(head, 3);
TRY {
debuged_remove(head, "12346");
- }
- CATCH(e) {
+ } CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
traverse(head);
TRY {
debuged_remove(head, "12346");
- }
- CATCH(e) {
+ } CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
}
traverse(head);
- xbt_test_add
- ("Free dict, create new fresh one, and then reset the dict");
+ xbt_test_add("Free dict, create new fresh one, and then reset the dict");
xbt_dict_free(&head);
fill(&head, homogeneous);
xbt_dict_reset(head);
if (!strcmp(key, "null"))
found = 1;
}
- xbt_test_assert(found,
- "the key 'null', associated to NULL is not found");
+ xbt_test_assert(found, "the key 'null', associated to NULL is not found");
}
xbt_dict_free(&head);
}
for (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_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);
head = xbt_dict_new();
/* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
for (j = 0; j < 1000; j++) {
xbt_dict_set(head, key, key, &free);
data = xbt_dict_get(head, key);
- xbt_test_assert(!strcmp(key, data),
- "Retrieved value (%s) != Injected value (%s)", key,
- data);
+ xbt_test_assert(!strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
count(head, j + 1);
}
xbt_dict_free(&head);
}
-
head = xbt_dict_new();
- xbt_test_add("Fill %d elements, with keys being the number of element",
- NB_ELM);
+ xbt_test_add("Fill %d elements, with keys being the number of element", NB_ELM);
for (j = 0; j < NB_ELM; j++) {
/* if (!(j%1000)) { printf("."); fflush(stdout); } */
-
key = xbt_malloc(10);
sprintf(key, "%d", j);
}
/*xbt_dict_dump(head,(void (*)(void*))&printf); */
- xbt_test_add
- ("Count the elements (retrieving the key and data for each)");
+ xbt_test_add("Count the elements (retrieving the key and data for each)");
i = countelems(head);
xbt_test_log("There is %d elements", i);
void *data;
/* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
for (j = 0; j < NB_ELM; j++) {
-
sprintf(key, "%d", j);
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(!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(!strcmp(key, (char *) data), "with get_ext, key=%s != data=%s", key, (char *) data);
}
}
free(key);
key = xbt_malloc(10);
for (j = 0; j < NB_ELM; j++) {
/* if (!(j%10000)) printf("."); fflush(stdout); */
-
sprintf(key, "%d", j);
xbt_dict_remove(head, key);
}
free(key);
-
xbt_test_add("Free the structure (twice)");
xbt_dict_free(&head);
xbt_dict_free(&head);
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_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_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 */
