/* 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. */
+#define DJB2_HASH_FUNCTION
+//#define FNV_HASH_FUNCTION
+
+#include <string.h>
+#include <stdio.h>
#include "xbt/ex.h"
+#include "xbt/log.h"
+#include "xbt/mallocator.h"
+#include "xbt_modinter.h"
#include "dict_private.h"
-XBT_LOG_NEW_SUBCATEGORY(dict,xbt,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict,xbt,
"Dictionaries provide the same functionnalities than hash tables");
/*####[ Private prototypes ]#################################################*/
+static xbt_mallocator_t dict_mallocator = NULL;
+static void* dict_mallocator_new_f(void);
+static void dict_mallocator_free_f(void* dict);
+static void dict_mallocator_reset_f(void* dict);
+
+
/*####[ Code ]###############################################################*/
/**
- * @brief Constructor
- * @return pointer to the destination
+ * \brief Constructor
+ * \return pointer to the destination
+ * \see xbt_dict_new_ext(), xbt_dict_free()
*
- * Creates and initialize a new dictionnary
+ * Creates and initialize a new dictionnary with a default hashtable size.
*/
-xbt_dict_t
-xbt_dict_new(void) {
- xbt_dict_t res= xbt_new(s_xbt_dict_t,1);
- res->head=NULL;
- return res;
+xbt_dict_t xbt_dict_new(void) {
+ xbt_dict_t dict;
+
+ if (dict_mallocator == NULL) {
+ /* first run */
+ dict_mallocator = xbt_mallocator_new(256,
+ dict_mallocator_new_f,
+ dict_mallocator_free_f,
+ dict_mallocator_reset_f);
+ dict_elm_mallocator = xbt_mallocator_new(256,
+ dict_elm_mallocator_new_f,
+ dict_elm_mallocator_free_f,
+ dict_elm_mallocator_reset_f);
+ }
+
+ dict = xbt_mallocator_get(dict_mallocator);
+ dict->table_size = 127;
+ dict->table = xbt_new0(xbt_dictelm_t, dict->table_size+1);
+ dict->count = 0;
+ dict->fill = 0;
+
+ return dict;
}
+
/**
- * @brief Destructor
- * @param dict the dictionnary to be freed
+ * \brief Destructor
+ * \param dict the dictionnary to be freed
*
- * Frees a cache structure with all its childs.
+ * Frees a dictionary with all the data
*/
-void
-xbt_dict_free(xbt_dict_t *dict) {
- if (dict && *dict) {
- if ((*dict)->head) {
- xbt_dictelm_free( &( (*dict)->head ) );
- (*dict)->head = NULL;
+void xbt_dict_free(xbt_dict_t *dict) {
+ int i;
+ xbt_dictelm_t current, previous;
+ int table_size;
+ xbt_dictelm_t *table;
+
+// if ( *dict ) xbt_dict_dump_sizes(*dict);
+
+ if (dict != NULL && *dict != NULL) {
+ table_size = (*dict)->table_size;
+ table = (*dict)->table;
+ for (i = 0; i < table_size; i++) {
+ current = table[i];
+ while (current != NULL) {
+ previous = current;
+ current = current->next;
+ xbt_dictelm_free(previous);
+ }
}
- free(*dict);
- *dict=NULL;
+ xbt_free(table);
+ xbt_mallocator_release(dict_mallocator, *dict);
+ *dict = NULL;
+ }
+}
+
+/**
+ * Returns the hash code of a string.
+ */
+static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len) {
+
+
+#ifdef DJB2_HASH_FUNCTION
+ /* fast implementation of djb2 algorithm */
+ int c;
+ register unsigned int hash = 5381;
+
+ while (str_len--) {
+ c = *str++;
+ hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+ }
+# elif defined(FNV_HASH_FUNCTION)
+ register unsigned int hash = 0x811c9dc5;
+ unsigned char *bp = (unsigned char *)str; /* start of buffer */
+ unsigned char *be = bp + str_len; /* beyond end of buffer */
+
+ while (bp < be) {
+ /* multiply by the 32 bit FNV magic prime mod 2^32 */
+ hash += (hash<<1) + (hash<<4) + (hash<<7) + (hash<<8) + (hash<<24);
+
+ /* xor the bottom with the current octet */
+ hash ^= (unsigned int)*bp++;
+ }
+
+# else
+ register unsigned int hash = 0;
+
+ while (str_len--) {
+ hash += (*str) * (*str);
+ str++;
+ }
+#endif
+
+ return hash;
+}
+
+static XBT_INLINE unsigned int xbt_dict_hash(const char *str) {
+#ifdef DJB2_HASH_FUNCTION
+ /* fast implementation of djb2 algorithm */
+ int c;
+ register unsigned int hash = 5381;
+
+ while ( (c = *str++) ) {
+ hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
}
+
+# elif defined(FNV_HASH_FUNCTION)
+ register unsigned int hash = 0x811c9dc5;
+
+ while (*str) {
+ /* multiply by the 32 bit FNV magic prime mod 2^32 */
+ hash += (hash<<1) + (hash<<4) + (hash<<7) + (hash<<8) + (hash<<24);
+
+ /* xor the bottom with the current octet */
+ hash ^= (unsigned int)*str++;
+ }
+
+# else
+ register unsigned int hash = 0;
+
+ while (*str) {
+ hash += (*str) * (*str);
+ str++;
+ }
+#endif
+ return hash;
+}
+
+/* Expend the size of the dict */
+static void xbt_dict_rehash(xbt_dict_t dict) {
+ const int oldsize = dict->table_size + 1;
+ register int newsize = oldsize * 2;
+ register int i;
+ register xbt_dictelm_t *currcell;
+ register xbt_dictelm_t *twincell;
+ register xbt_dictelm_t bucklet;
+ register xbt_dictelm_t *pprev;
+
+ 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;
+ DEBUG2("REHASH (%d->%d)",oldsize,newsize);
+
+ for (i=0; i<oldsize; i++,currcell++) {
+ if (!*currcell) /* empty cell */
+ 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 :
+ - stay in cell i (ie, currcell)
+ - go to the cell i+oldsize (ie, twincell) */
+ if ((bucklet->hash_code & newsize) != i) { /* Move to b */
+ *pprev = bucklet->next;
+ bucklet->next = *twincell;
+ if (!*twincell)
+ dict->fill++;
+ *twincell = bucklet;
+ continue;
+ } else {
+ pprev = &bucklet->next;
+ }
+
+ }
+
+ if (!*currcell) /* everything moved */
+ dict->fill--;
+ }
}
/**
* \param free_ctn function to call with (\a key as argument) when
* \a key is removed from the dictionnary
*
- * set the \a data in the structure under the \a key, which can be any kind
+ * 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) {
+XBT_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_dict_hash_ext(key,key_len);
+ xbt_dictelm_t current, previous = NULL;
xbt_assert(dict);
+
+ DEBUG5("ADD %.*s hash = %d, size = %d, & = %d",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 || memcmp(key, current->key, key_len))) {
+ previous = current;
+ current = current->next;
+ }
- xbt_dictelm_set_ext(&(dict->head),
- key, key_len, data, free_ctn);
+ if (current == NULL) {
+ /* this key doesn't exist yet */
+ current = xbt_dictelm_new(key, key_len, hash_code, data, free_ctn);
+ dict->count++;
+ if (previous == NULL) {
+ dict->table[hash_code & dict->table_size] = current;
+ dict->fill++;
+ if ((dict->fill * 100) / (dict->table_size + 1) > MAX_FILL_PERCENT)
+ xbt_dict_rehash(dict);
+ } else {
+ previous->next = current;
+ }
+ }
+ else {
+
+ DEBUG6("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 */
+ if (current->content != NULL && current->free_f != NULL) {
+ current->free_f(current->content);
+ }
+ current->content = data;
+ current->free_f = free_ctn;
+ }
}
/**
* \brief Add data to the dict (null-terminated key)
*
- * \param dict the head of the dict
+ * \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 key as argument) when
* set the \a data in the structure under the \a key, which is a
* null terminated string.
*/
-void
-xbt_dict_set(xbt_dict_t dict,
- const char *key,
- void *data,
- void_f_pvoid_t *free_ctn) {
+void xbt_dict_set(xbt_dict_t dict,
+ const char *key,
+ void *data,
+ void_f_pvoid_t free_ctn) {
- xbt_assert(dict);
-
- xbt_dictelm_set(&(dict->head), key, data, free_ctn);
+ xbt_dict_set_ext(dict, key, strlen(key), data, free_ctn);
}
/**
* \param dict the dealer of data
* \param key the key to find data
* \param key_len the size of the \a key
- * \returns the data that we are looking for
+ * \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) {
+void *xbt_dict_get_ext(xbt_dict_t dict,
+ const char *key, int key_len) {
+
+
+ unsigned int hash_code = xbt_dict_hash_ext(key,key_len);
+ xbt_dictelm_t current;
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))) {
+ current = current->next;
+ }
+
+ if (current == NULL)
+ THROW2(not_found_error, 0, "key %.*s not found", key_len, key);
- return xbt_dictelm_get_ext(dict->head, key, key_len);
+ return current->content;
}
/**
*
* \param dict the dealer of data
* \param key the key to find data
- * \returns the data that we are looking for
+ * \return the data that we are looking for
*
- * Search the given \a key. THROWs mismatch_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 NULL without exception when
* not found.
*/
-void *
-xbt_dict_get(xbt_dict_t dict,
- const char *key) {
+void *xbt_dict_get(xbt_dict_t dict,
+ const char *key) {
+
+ unsigned int hash_code = xbt_dict_hash(key);
+ xbt_dictelm_t current;
+
xbt_assert(dict);
- return xbt_dictelm_get(dict->head, key);
+ current = dict->table[hash_code & dict->table_size];
+ while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key)))
+ current = current->next;
+
+ if (current == NULL)
+ THROW1(not_found_error, 0, "key %s not found", key);
+
+ return current->content;
}
/**
* \brief like xbt_dict_get(), but returning NULL when not found
*/
-void *
-xbt_dict_get_or_null(xbt_dict_t dict,
- const char *key) {
- xbt_ex_t e;
- void *res=NULL;
- TRY {
- res = xbt_dictelm_get(dict->head, key);
- } CATCH(e) {
- if (e.category != not_found_error)
- RETHROW;
- xbt_ex_free(e);
- res=NULL;
- }
- return res;
+void *xbt_dict_get_or_null(xbt_dict_t dict,
+ const char *key) {
+ unsigned int hash_code = xbt_dict_hash(key);
+ xbt_dictelm_t current;
+
+ 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;
+
+ if (current == NULL)
+ return NULL;
+
+ return current->content;
}
* \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)
*/
-void
-xbt_dict_remove_ext(xbt_dict_t dict,
- const char *key,
- int key_len) {
+void xbt_dict_remove_ext(xbt_dict_t dict,
+ const char *key,
+ int key_len) {
+
+
+ unsigned int hash_code = xbt_dict_hash_ext(key,key_len);
+ xbt_dictelm_t current, previous = NULL;
+
xbt_assert(dict);
-
- xbt_dictelm_remove_ext(dict->head, key, key_len);
+
+// 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))) {
+ previous = current; /* save the previous node */
+ current = current->next;
+ }
+
+ if (current == NULL)
+ THROW2(not_found_error, 0, "key %.*s not found", key_len, key);
+
+ if (previous != NULL) {
+ previous->next = current->next;
+ } else {
+ dict->table[hash_code & dict->table_size] = current->next;
+ }
+
+ if (!dict->table[hash_code & dict->table_size])
+ dict->fill--;
+
+ xbt_dictelm_free(current);
+ dict->count--;
}
/**
* \brief Remove data from the dict (null-terminated key)
*
- * \param dict the head of the dict
+ * \param dict the dict
* \param key the key of the data to be removed
*
* Remove the entry associated with the given \a key
*/
-void
-xbt_dict_remove(xbt_dict_t dict,
- const char *key) {
- if (!dict)
- THROW1(arg_error,0,"Asked to remove key %s from NULL dict",key);
+void xbt_dict_remove(xbt_dict_t dict, const char *key) {
+ xbt_dict_remove_ext(dict, key, strlen(key));
+}
+
+/**
+ * \brief Remove all data from the dict
+ * \param dict the dict
+ */
+void xbt_dict_reset(xbt_dict_t dict) {
- xbt_dictelm_remove(dict->head, key);
+ 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];
+ while (current != NULL) {
+ previous = current;
+ current = current->next;
+ xbt_dictelm_free(previous);
+ }
+ dict->table[i] = NULL;
+ }
+
+ dict->count = 0;
+ dict->fill = 0;
}
+/**
+ * \brief Return the number of elements in the dict.
+ * \param dict a dictionary
+ */
+int xbt_dict_length(xbt_dict_t dict) {
+ xbt_assert(dict);
+
+ return dict->count;
+}
/**
* \brief Outputs the content of the structure (debuging purpose)
* \param output a function to dump each data in the tree
*
* Ouputs the content of the structure. (for debuging purpose). \a ouput is a
- * function to output the data. If NULL, data won't be displayed, just the tree structure.
+ * 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;
+ xbt_dictelm_t element;
+ printf("Dict %p:\n", dict);
+ if (dict != NULL) {
+ for (i = 0; i < dict->table_size; i++) {
+ element = dict->table[i];
+ if (element) {
+ printf("[\n");
+ while (element != NULL) {
+ printf(" %s -> ", element->key);
+ if (output != NULL) {
+ (*output)(element->content);
+ }
+ printf("\n");
+ element = element->next;
+ }
+ printf("]\n");
+ } else {
+ printf("[]\n");
+ }
+ }
+ }
+}
+
+xbt_dynar_t all_sizes = NULL;
+/** @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;
+ 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);
+ }
+ }
+ 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("%delm x %u cells; ",count,size);
+ }
+ }
+ printf("\n");
+ xbt_dynar_free(&sizes);
+}
+
+/**
+ * Destroy the dict mallocators.
+ * This is an internal XBT function called by xbt_exit().
*/
+void xbt_dict_exit(void) {
+ if (dict_mallocator != NULL) {
+ xbt_mallocator_free(dict_mallocator);
+ dict_mallocator = NULL;
+ xbt_mallocator_free(dict_elm_mallocator);
+ dict_elm_mallocator = NULL;
+ }
+ 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)
+ continue;
+ if (size==0)
+ continue;
+ printf("%delm x %d cells; ",count,size);
+ avg += count * size;
+ total_count += size;
+ }
+ printf("; %f elm per cell\n",avg/(double)total_count);
+ }
+}
-void
-xbt_dict_dump(xbt_dict_t dict,
- void_f_pvoid_t *output) {
+static void* dict_mallocator_new_f(void) {
+ return xbt_new(s_xbt_dict_t, 1);
+}
- printf("Dict %p:\n", (void*)dict);
- xbt_dictelm_dump(dict ? dict->head: NULL, output);
+static void dict_mallocator_free_f(void* dict) {
+ xbt_free(dict);
+}
+
+static void dict_mallocator_reset_f(void* dict) {
+ /* nothing to do because all fields are
+ * initialized in xbt_dict_new
+ */
}
#ifdef SIMGRID_TEST
#include "xbt/ex.h"
#include "portable.h"
-XBT_LOG_EXTERNAL_CATEGORY(dict);
-XBT_LOG_DEFAULT_CATEGORY(dict);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
+XBT_LOG_DEFAULT_CATEGORY(xbt_dict);
XBT_TEST_SUITE("dict","Dict data container");
printf("%s",(char*)PRINTF_STR(str));
}
-static void debuged_add(xbt_dict_t head,const char*key)
-{
- char *data=xbt_strdup(key);
+static void debuged_add_ext(xbt_dict_t head,const char*key,const char*data_to_fill) {
+ char *data=xbt_strdup(data_to_fill);
- xbt_test_log1("Add %s",PRINTF_STR(key));
+ xbt_test_log2("Add %s under %s",PRINTF_STR(data_to_fill),PRINTF_STR(key));
xbt_dict_set(head,key,data,&free);
- if (XBT_LOG_ISENABLED(dict,xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(xbt_dict,xbt_log_priority_debug)) {
xbt_dict_dump(head,(void (*)(void*))&printf);
fflush(stdout);
}
}
+static void debuged_add(xbt_dict_t head,const char*key) {
+ debuged_add_ext(head,key,key);
+}
static void fill(xbt_dict_t *head) {
xbt_test_add0("Fill in the dictionnary");
debuged_add(*head,"1234");
/* Need of common ancestor */
debuged_add(*head,"123457");
-
}
-static void search(xbt_dict_t head,const char*key) {
- void *data;
+
+static void search_ext(xbt_dict_t head,const char*key, const char *data) {
+ void *found;
xbt_test_add1("Search %s",key);
- data=xbt_dict_get(head,key);
- xbt_test_log1("Found %s",(char *)data);
+ found=xbt_dict_get(head,key);
+ xbt_test_log1("Found %s",(char *)found);
if (data)
- xbt_test_assert0(!strcmp((char*)data,key),"Key and data do not match");
+ xbt_test_assert1(found,"data do not match expectations: found NULL while searching for %s",data);
+ if (found)
+ xbt_test_assert2(!strcmp((char*)data,found),"data do not match expectations: found %s while searching for %s", (char*)found, data);
+}
+
+static void search(xbt_dict_t head,const char*key) {
+ search_ext(head,key,key);
}
static void debuged_remove(xbt_dict_t head,const char*key) {
xbt_dict_cursor_t cursor=NULL;
char *key;
char *data;
+ int i = 0;
xbt_dict_foreach(head,cursor,key,data) {
- xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(data));
+ if (!key || !data || strcmp(key,data)) {
+ xbt_test_log3("Seen #%d: %s->%s",++i,PRINTF_STR(key),PRINTF_STR(data));
+ } else {
+ xbt_test_log2("Seen #%d: %s",++i,PRINTF_STR(key));
+ }
xbt_test_assert2(!data || !strcmp(key,data),
- "Key(%s) != value(%s). Abording\n",key,data);
+ "Key(%s) != value(%s). Abording",key,data);
}
}
static void search_not_found(xbt_dict_t head, const char *data) {
+ int ok=0;
xbt_ex_t e;
xbt_test_add1("Search %s (expected not to be found)",data);
TRY {
- data = xbt_dict_get(head,"Can't be found");
+ data = xbt_dict_get(head, data);
THROW1(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);
+ ok=1;
+ }
+ xbt_test_assert0(ok,"Exception not raised");
+}
+
+static void count(xbt_dict_t dict, int length) {
+ xbt_dict_cursor_t cursor;
+ char *key;
+ void *data;
+ int effective = 0;
+
+
+ xbt_test_add1("Count elements (expecting %d)", length);
+ xbt_test_assert2(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
+
+ xbt_dict_foreach(dict,cursor,key,data) {
+ effective++;
}
+ xbt_test_assert2(effective == length, "Effective length(%d) != %d.", effective, length);
}
xbt_ex_t e;
char *data;
-XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrive, traverse"){
+XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrieve, traverse"){
+ xbt_test_add0("Traversal the null dictionnary");
+ traverse(head);
- xbt_test_add0("Traversal the empty dictionnary");
+ xbt_test_add0("Traversal and search the empty dictionnary");
+ head = xbt_dict_new();
traverse(head);
+ TRY {
+ debuged_remove(head,"12346");
+ } CATCH(e) {
+ if (e.category != not_found_error)
+ xbt_test_exception(e);
+ xbt_ex_free(e);
+ }
+ xbt_dict_free(&head);
xbt_test_add0("Traverse the full dictionnary");
fill(&head);
+ count(head, 7);
+
+ debuged_add_ext(head,"toto","tutu");
+ search_ext(head,"toto","tutu");
+ debuged_remove(head,"toto");
search(head,"12a");
traverse(head);
/* CHANGING */
fill(&head);
+ count(head, 7);
xbt_test_add0("Change 123 to 'Changed 123'");
xbt_dict_set(head,"123",strdup("Changed 123"),&free);
+ count(head, 7);
xbt_test_add0("Change 123 back to '123'");
xbt_dict_set(head,"123",strdup("123"),&free);
+ count(head, 7);
xbt_test_add0("Change 12a to 'Dummy 12a'");
xbt_dict_set(head,"12a",strdup("Dummy 12a"),&free);
+ count(head, 7);
xbt_test_add0("Change 12a to '12a'");
xbt_dict_set(head,"12a",strdup("12a"),&free);
+ count(head, 7);
xbt_test_add0("Traverse the resulting dictionnary");
traverse(head);
- /* RETRIVE */
+ /* RETRIEVE */
xbt_test_add0("Search 123");
data = xbt_dict_get(head,"123");
xbt_test_assert(data);
XBT_TEST_UNIT("remove",test_dict_remove,"Removing some values"){
fill(&head);
+ count(head, 7);
xbt_test_add0("Remove non existing data");
TRY {
debuged_remove(head,"Does not exist");
xbt_dict_free(&head);
- xbt_test_add0("Remove data from the NULL dict");
- TRY {
- debuged_remove(head,"12345");
- } CATCH(e) {
- if (e.category != arg_error)
- xbt_test_exception(e);
- xbt_ex_free(e);
- }
-
xbt_test_add0("Remove each data manually (traversing the resulting dictionnary each time)");
fill(&head);
debuged_remove(head,"12a"); traverse(head);
+ count(head, 6);
debuged_remove(head,"12b"); traverse(head);
+ count(head, 5);
debuged_remove(head,"12"); traverse(head);
+ count(head, 4);
debuged_remove(head,"123456"); traverse(head);
+ count(head, 3);
TRY {
debuged_remove(head,"12346");
} CATCH(e) {
xbt_ex_free(e);
} traverse(head);
+ xbt_test_add0("Free dict, create new fresh one, and then reset the dict");
+ xbt_dict_free(&head);
+ fill(&head);
+ xbt_dict_reset(head);
+ count(head, 0);
+ traverse(head);
+
xbt_test_add0("Free the dictionnary twice");
xbt_dict_free(&head);
xbt_dict_free(&head);
xbt_test_add0("Store NULL under 'null'");
xbt_dict_set(head,"null",NULL,NULL);
- search(head,"null");
+ search_ext(head,"null",NULL);
xbt_test_add0("Check whether I see it while traversing...");
{
xbt_dict_cursor_t cursor=NULL;
char *key;
int found=0;
-
+
xbt_dict_foreach(head,cursor,key,data) {
- xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(data));
+ if (!key || !data || strcmp(key,data)) {
+ xbt_test_log2("Seen: %s->%s",PRINTF_STR(key),PRINTF_STR(data));
+ } else {
+ xbt_test_log1("Seen: %s",PRINTF_STR(key));
+ }
+
if (!strcmp(key,"null"))
found = 1;
}
}
return res;
}
-
+
XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){
xbt_dict_t head=NULL;
int i,j,k, nb;
srand((unsigned int)time(NULL));
- xbt_test_add0("CRASH test");
- xbt_test_log0("Fill the struct, count its elems and frees the structure (x10)");
- xbt_test_log1("using 1000 elements with %d chars long randomized keys.",SIZEOFKEY);
-
for (i=0;i<10;i++) {
+ xbt_test_add2("CRASH test number %d (%d to go)",i+1,10-i-1);
+ xbt_test_log0("Fill the struct, count its elems and frees the structure");
+ xbt_test_log1("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);
+ /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
nb=0;
for (j=0;j<1000;j++) {
+ char *data = NULL;
key=xbt_malloc(SIZEOFKEY);
- for (k=0;k<SIZEOFKEY-1;k++)
- key[k]=rand() % ('z' - 'a') + 'a';
- key[k]='\0';
- /* printf("[%d %s]\n",j,key); */
+ do {
+ for (k=0;k<SIZEOFKEY-1;k++)
+ key[k]=rand() % ('z' - 'a') + 'a';
+ key[k]='\0';
+ /* printf("[%d %s]\n",j,key); */
+ data = xbt_dict_get_or_null(head,key);
+ } while (data != NULL);
+
xbt_dict_set(head,key,key,&free);
+ data = xbt_dict_get(head,key);
+ xbt_test_assert2(!strcmp(key,data), "Retrieved value (%s) != Injected value (%s)",key,data);
+
+ count(head,j+1);
}
/* xbt_dict_dump(head,(void (*)(void*))&printf); */
- nb = countelems(head);
- xbt_test_assert1(nb == 1000,"found %d elements instead of 1000",nb);
traverse(head);
xbt_dict_free(&head);
xbt_dict_free(&head);
head=xbt_dict_new();
xbt_test_add1("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); }
+ /* if (!(j%1000)) { printf("."); fflush(stdout); } */
key = xbt_malloc(10);
sprintf(key,"%d",j);
xbt_dict_set(head,key,key,&free);
}
-
+ /*xbt_dict_dump(head,(void (*)(void*))&printf);*/
+
xbt_test_add0("Count the elements (retrieving the key and data for each)");
i = countelems(head);
xbt_test_log1("There is %d elements",i);
xbt_test_add1("Search my %d elements 20 times",NB_ELM);
key=xbt_malloc(10);
for (i=0;i<20;i++) {
- // if (i%10) printf("."); else printf("%d",i/10); fflush(stdout);
+ /* 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_assert2(!strcmp(key,(char*)data),
- "key=%s != data=%s\n",key,(char*)data);
+ "with get, key=%s != data=%s",key,(char*)data);
+ data = xbt_dict_get_ext(head,key,strlen(key));
+ xbt_test_assert2(!strcmp(key,(char*)data),
+ "with get_ext, key=%s != data=%s",key,(char*)data);
}
}
free(key);
xbt_test_add1("Remove my %d elements",NB_ELM);
key=xbt_malloc(10);
for (j=0;j<NB_ELM;j++) {
- //if (!(j%10000)) printf("."); fflush(stdout);
+ /* if (!(j%10000)) printf("."); fflush(stdout); */
sprintf(key,"%d",j);
xbt_dict_remove(head,key);
