X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/603e3e0717f9170f6844b293d04ad0c2ebdbaa84..7f7f3561941c2be9d43711afb3036dc47df26651:/testsuite/xbt/dict_crash.c

diff --git a/testsuite/xbt/dict_crash.c b/testsuite/xbt/dict_crash.c
index 75fdb101ee..7c47823a7e 100644
--- a/testsuite/xbt/dict_crash.c
+++ b/testsuite/xbt/dict_crash.c
@@ -12,7 +12,7 @@
 #include <time.h>
 #include <stdio.h>
 
-#define NB_ELM 200000
+#define NB_ELM 20000
 #define SIZEOFKEY 1024
 
 static void print_str(void *str);
@@ -48,14 +48,14 @@ static gras_error_t countelems(gras_dict_t *head,int*count) {
   return no_error;
 }
 
-int main() {
+int main(int argc,char **argv) {
   gras_error_t errcode;
   gras_dict_t *head=NULL;
   int i,j,k, nb;
   char *key;
   void *data;
 
-  TRY(gras_log_control_set("root.thresh=info"));
+  gras_init_defaultlog(&argc,argv,"dict.thresh=verbose");
   srand((unsigned int)time(NULL));
 
   printf("Dictionnary: CRASH test:\n");
@@ -77,7 +77,7 @@ int main() {
 	key[k]=rand() % ('z' - 'a') + 'a';
       key[k]='\0';
       //      printf("[%d %s]\n",j,key);
-      TRYFAIL(gras_dict_insert(head,strdup(key),key,&free));
+      TRYFAIL(gras_dict_set(head,key,key,&free));
     }
     nb=0;
     //    gras_dict_dump(head,(void (*)(void*))&printf);
@@ -92,24 +92,27 @@ int main() {
 
 
   TRYFAIL(gras_dict_new(&head));
-  printf("\n Fill 200 000 elements, with keys being the number of element\n");
-  printf("  (a point is 10 000 elements)\n");
+  printf("\n Fill 20 000 elements, with keys being the number of element\n");
+  printf("  (a point is 1 000 elements)\n");
   for (j=0;j<NB_ELM;j++) {
-    if (!(j%10000)) printf("."); fflush(stdout);
+    if (!(j%1000)) {
+      printf("."); 
+      fflush(stdout);
+    }
     if (!(key=malloc(10))) {
       fprintf(stderr,"Out of memory\n");
       abort();
     }
     
     sprintf(key,"%d",j);
-    TRYFAIL(gras_dict_insert(head,key,key,&free));
+    TRYFAIL(gras_dict_set(head,key,key,&free));
   }
 
   printf("\n Count the elements (retrieving the key and data for each): \n");
   TRYFAIL(countelems(head,&i));
 
   printf(" There is %d elements\n",i);
-  printf("\n Search my 200 000 elements 20 times. (a point is a test)\n");
+  printf("\n Search my 20 000 elements 20 times. (a point is a test)\n");
   if (!(key=malloc(10))) {
     fprintf(stderr,"Out of memory\n");
     abort();
@@ -119,18 +122,19 @@ int main() {
     for (j=0;j<NB_ELM;j++) {
       
       sprintf(key,"%d",j);
-      TRYFAIL(gras_dict_retrieve(head,key,&data));
+      TRYFAIL(gras_dict_get(head,key,&data));
       if (strcmp(key,(char*)data)) {
 	printf("key=%s != data=%s\n",key,(char*)data);
 	abort();
       }
     }
   }
+  free(key);
 
-  printf("\n Remove my 200 000 elements. (a point is 10 000 elements)\n");
+  printf("\n Remove my 20 000 elements. (a point is 10 000 elements)\n");
   if (!(key=malloc(10))) {
     fprintf(stderr,"Out of memory\n");
-    return 3;
+    abort();
   }
   for (j=0;j<NB_ELM;j++) {
     if (!(j%10000)) printf("."); fflush(stdout);
@@ -138,9 +142,14 @@ int main() {
     sprintf(key,"%d",j);
     TRYFAIL(gras_dict_remove(head,key));
   }
+  printf("\n");
+  free(key);
 
+  
+  printf("\n Free the structure (twice)\n");
   gras_dict_free(&head);
   gras_dict_free(&head);
-  printf("\n");
+  
+  gras_exit();
   return 0;
 }