#include "dict_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
- "Dictionaries provide the same functionalities than hash tables");
+ "Dictionaries provide the same functionalities as hash tables");
/**
* \brief Constructor
* \return pointer to the destination
- * \see xbt_dict_free()
+ * \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
* \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
+ * \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.
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
xbt_dictelm_t current, previous = NULL;
- xbt_assert(dict);
XBT_CDEBUG(xbt_dict,
"ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code,
* \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
+ * \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.
*
* Search the given \a key. Throws not_found_error when not found.
*/
-XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key,
- int key_len)
+XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len)
{
-
-
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
- xbt_dictelm_t current;
-
- xbt_assert(dict);
+ xbt_dictelm_t current = dict->table[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
|| memcmp(key, current->key, key_len))) {
return current->content;
}
-/**
- * \brief like xbt_dict_get_ext(), but returning NULL when not found
- */
-void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key,
- int key_len)
+/** @brief like xbt_dict_get_ext(), but returning NULL when not found */
+void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len)
{
-
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
- xbt_dictelm_t current;
+ xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- xbt_assert(dict);
-
- current = dict->table[hash_code & dict->table_size];
while (current != NULL &&
(hash_code != current->hash_code || key_len != current->key_len
|| memcmp(key, current->key, key_len))) {
*/
char *xbt_dict_get_key(xbt_dict_t dict, const void *data)
{
- int i;
- xbt_dictelm_t current;
-
-
- for (i = 0; i <= dict->table_size; i++) {
- current = dict->table[i];
+ for (int i = 0; i <= dict->table_size; i++) {
+ xbt_dictelm_t current = dict->table[i];
while (current != NULL) {
if (current->content == data)
return current->key;
return NULL;
}
-/**
- * @brief retrieve the key associated to that xbt_dictelm_t.
- *
- */
+/** @brief retrieve the key associated to that xbt_dictelm_t. */
char *xbt_dict_get_elm_key(xbt_dictelm_t elm)
{
return elm->key;
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_dictelm_t current = dict->table[hash_code & dict->table_size];
- 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;
*
* Remove the entry associated with the given \a key (throws not_found)
*/
-XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key,
- int key_len)
+XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len)
{
-
-
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
- xbt_dictelm_t current, previous = NULL;
+ xbt_dictelm_t previous = NULL;
+ xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
- xbt_assert(dict);
-
- // fprintf(stderr,"RM %.*s hash = %d, size = %d, & = %d\n",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
|| strncmp(key, current->key, key_len))) {
xbt_dict_remove_ext(dict, key, strlen(key));
}
-#ifdef XBT_USE_DEPRECATED
-/**
- * \brief Add data to the dict (arbitrary key)
- * \param dict the container
- * \param key the key to set the new data
- * \param data the data to add in the dict
- *
- * Set the \a data in the structure under the \a key.
- * Both \a data and \a key are considered as uintptr_t.
- */
-XBT_INLINE void xbt_dicti_set(xbt_dict_t dict,
- uintptr_t key, uintptr_t data)
-{
- xbt_dict_set_ext(dict, (void *)&key, sizeof key, (void*)data, NULL);
-}
-
-/**
- * \brief Retrieve data from the dict (key considered as a uintptr_t)
- *
- * \param dict the dealer of data
- * \param key the key to find data
- * \return the data that we are looking for (or 0 if not found)
- *
- * Mixing uintptr_t keys with regular keys in the same dict is discouraged
- */
-XBT_INLINE uintptr_t xbt_dicti_get(xbt_dict_t dict, uintptr_t key)
-{
- return (uintptr_t)xbt_dict_get_or_null_ext(dict, (void *)&key, sizeof key);
-}
-
-/** Remove a uintptr_t key from the dict */
-XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key)
-{
- xbt_dict_remove_ext(dict, (void *)&key, sizeof key);
-}
-#endif
-
-/**
- * \brief Remove all data from the dict
- * \param dict the dict
- */
+/** @brief Remove all data from the dict */
void xbt_dict_reset(xbt_dict_t dict)
{
-
- int i;
- xbt_dictelm_t current, previous = NULL;
-
- xbt_assert(dict);
-
if (dict->count == 0)
return;
- for (i = 0; i <= dict->table_size; i++) {
- current = dict->table[i];
+ for (int i = 0; i <= dict->table_size; i++) {
+ xbt_dictelm_t previous = NULL;
+ xbt_dictelm_t current = dict->table[i];
while (current != NULL) {
previous = current;
current = current->next;
*/
XBT_INLINE int xbt_dict_length(xbt_dict_t dict)
{
- xbt_assert(dict);
-
return dict->count;
}
/** @brief shows some debugging info about the bucklet repartition */
void xbt_dict_dump_sizes(xbt_dict_t dict)
{
-
- int i;
unsigned int count;
unsigned int size;
- xbt_dictelm_t element;
+
+ 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), NULL);
- printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count,
- dict->fill, dict->table_size);
- if (dict != NULL) {
- for (i = 0; i < dict->table_size; i++) {
- element = dict->table[i];
- size = 0;
- if (element) {
- while (element != NULL) {
- 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);
+ for (int i = 0; i < dict->table_size; i++) {
+ xbt_dictelm_t element = dict->table[i];
+ size = 0;
+ if (element) {
+ while (element != NULL) {
+ size++;
+ element = element->next;
}
}
- if (!all_sizes)
- all_sizes = xbt_dynar_new(sizeof(int), NULL);
-
- 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)
- continue;
- if (size == 0)
- continue;
- printf("%uelm x %u cells; ", count, size);
+ 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), NULL);
+
+ 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)
+ continue;
+ if (size == 0)
+ continue;
+ printf("%uelm x %u cells; ", count, size);
}
printf("\n");
xbt_dynar_free(&sizes);
#include "xbt/ex.h"
#include "src/portable.h"
-#define PRINTF_STR(a) (a)?:"(null)"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
{
char *data = xbt_strdup(data_to_fill);
- xbt_test_log("Add %s under %s", PRINTF_STR(data_to_fill),
- PRINTF_STR(key));
+ xbt_test_log("Add %s under %s", data_to_fill, key);
xbt_dict_set(head, key, data, free_f);
if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
static void debuged_remove(xbt_dict_t head, const char *key)
{
- xbt_test_add("Remove '%s'", PRINTF_STR(key));
+ xbt_test_add("Remove '%s'", key);
xbt_dict_remove(head, key);
/* xbt_dict_dump(head,(void (*)(void*))&printf); */
}
xbt_dict_foreach(head, cursor, key, data) {
if (!key || !data || strcmp(key, data)) {
- xbt_test_log("Seen #%d: %s->%s", ++i, PRINTF_STR(key),
- PRINTF_STR(data));
+ xbt_test_log("Seen #%d: %s->%s", ++i, key, data);
} else {
- xbt_test_log("Seen #%d: %s", ++i, PRINTF_STR(key));
+ xbt_test_log("Seen #%d: %s", ++i, key);
}
xbt_test_assert(!data || !strcmp(key, data),
"Key(%s) != value(%s). Aborting", key, data);
xbt_dict_foreach(head, cursor, key, data) {
if (!key || !data || strcmp(key, data)) {
- xbt_test_log("Seen: %s->%s", PRINTF_STR(key), PRINTF_STR(data));
+ xbt_test_log("Seen: %s->%s", key, data);
} else {
- xbt_test_log("Seen: %s", PRINTF_STR(key));
+ xbt_test_log("Seen: %s", key);
}
if (!strcmp(key, "null"))
