X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa92714018ad2134de97bf403cbebeee6d863b3f..12442080c860b7affd1b246f12895bda4f304330:/src/xbt/dict.c

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index c97f224a32..4422f9d8ce 100644
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -8,6 +8,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <string.h>
+#include <stdio.h>
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
@@ -127,7 +128,7 @@ void xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize) {
 /**
  * Returns the hash code of a string.
  */
-static unsigned int xbt_dict_hash(const char *str, int str_len) {
+static unsigned int xbt_dict_hash_ext(const char *str, int str_len) {
   /* fast implementation of djb2 algorithm */
   unsigned int hash = 5381;
   int c;
@@ -140,6 +141,18 @@ static unsigned int xbt_dict_hash(const char *str, int str_len) {
   return hash;
 }
 
+static unsigned int xbt_dict_hash(const char *str) {
+  /* fast implementation of djb2 algorithm */
+  unsigned int hash = 5381;
+  int c;
+  
+  while ( (c = *str++) ) {
+    hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+  }
+  
+  return hash;
+}
+
 /**
  * \brief Add data to the dict (arbitrary key)
  * \param dict the container
@@ -157,10 +170,12 @@ void xbt_dict_set_ext(xbt_dict_t      dict,
 		      int              key_len,
 		      void            *data,
 		      void_f_pvoid_t  *free_ctn) {
-  xbt_assert(dict);
 
-  unsigned int hash_code = xbt_dict_hash(key,key_len) % dict->table_size;
+  unsigned int hash_code;
   xbt_dictelm_t current, previous = NULL;
+  xbt_assert(dict);
+  
+  hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size;
 
   current = dict->table[hash_code];
   while (current != NULL &&
@@ -225,11 +240,15 @@ void xbt_dict_set(xbt_dict_t     dict,
 void *xbt_dict_get_ext(xbt_dict_t      dict,
 		       const char     *key,
 		       int             key_len) {
-  xbt_assert(dict);
 
-  unsigned int hash_code = xbt_dict_hash(key,key_len) % dict->table_size;
+
+  unsigned int hash_code;
   xbt_dictelm_t current;
 
+  xbt_assert(dict);
+  
+  hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size;
+
   current = dict->table[hash_code];
   while (current != NULL &&
 	 (key_len != current->key_len || strncmp(key, current->key, key_len))) {
@@ -256,11 +275,15 @@ void *xbt_dict_get_ext(xbt_dict_t      dict,
  */
 void *xbt_dict_get(xbt_dict_t dict,
 		   const char *key) {
-  xbt_assert(dict);
 
-  unsigned int hash_code = xbt_dict_hash(key) % dict->table_size;
+
+  unsigned int hash_code ;
   xbt_dictelm_t current;
 
+  xbt_assert(dict);
+
+  hash_code = xbt_dict_hash(key) % dict->table_size;
+
   current = dict->table[hash_code];
   while (current != NULL && (strcmp(key, current->key))) {
     current = current->next;
@@ -304,11 +327,15 @@ void *xbt_dict_get_or_null(xbt_dict_t     dict,
 void xbt_dict_remove_ext(xbt_dict_t  dict,
 			 const char  *key,
 			 int          key_len) {
-  xbt_assert(dict);
 
-  unsigned int hash_code = xbt_dict_hash(key,key_len) % dict->table_size;
+
+  unsigned int hash_code ;
   xbt_dictelm_t current, previous = NULL;
 
+  xbt_assert(dict);
+
+  hash_code = xbt_dict_hash_ext(key,key_len) % dict->table_size;
+
   current = dict->table[hash_code];
   while (current != NULL &&
 	 (key_len != current->key_len || strncmp(key, current->key, key_len))) {
@@ -352,10 +379,16 @@ void xbt_dict_remove(xbt_dict_t  dict,
  * \param dict the dict
  */
 void xbt_dict_reset(xbt_dict_t dict) {
-  xbt_assert(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];
     while (current != NULL) {
@@ -383,9 +416,13 @@ int xbt_dict_length(xbt_dict_t dict) {
  * Add an already mallocated element to a dictionary.
  */
 void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element) {
-  xbt_assert(dict);
 
-  int hashcode = xbt_dict_hash(element->key,element->key_len) % dict->table_size;
+
+  int hashcode;
+
+  xbt_assert(dict);
+  
+  hashcode = xbt_dict_hash_ext(element->key,element->key_len) % dict->table_size;
   element->next = dict->table[hashcode];
   dict->table[hashcode] = element;
 }
@@ -555,8 +592,20 @@ char *data;
 
 
 XBT_TEST_UNIT("basic",test_dict_basic,"Basic usage: change, retrieve, traverse"){
-  xbt_test_add0("Traversal the empty dictionnary");
+  xbt_test_add0("Traversal the null dictionnary");
+  traverse(head);
+
+  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);
@@ -732,7 +781,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){
 
   for (i=0;i<10;i++) {
     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++) {
       key=xbt_malloc(SIZEOFKEY);
@@ -755,7 +804,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){
   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);
     
@@ -770,7 +819,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){
   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);
@@ -784,7 +833,7 @@ XBT_TEST_UNIT("crash",test_dict_crash,"Crash test"){
   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);