X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83fd3e71884af5cb063e04ab0b42c3e4c897302f..0447db21f56b3586a6b8f004c2bfbdb71d0d90a0:/testsuite/xbt/dict_crash.c

diff --git a/testsuite/xbt/dict_crash.c b/testsuite/xbt/dict_crash.c
index 8da4a7c79e..8c4b79b99b 100644
--- a/testsuite/xbt/dict_crash.c
+++ b/testsuite/xbt/dict_crash.c
@@ -11,6 +11,7 @@
 #include <gras.h>
 #include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define NB_ELM 200000
 #define SIZEOFKEY 1024
@@ -20,6 +21,7 @@ static void print_str(void *str) {
   printf("%s",(char*)str);
 }
 
+GRAS_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 
 static gras_error_t traverse(gras_dict_t *head) {
   gras_dict_cursor_t *cursor=NULL;
@@ -27,11 +29,9 @@ static gras_error_t traverse(gras_dict_t *head) {
   char *data;
 
   gras_dict_foreach(head,cursor,key,data) {
-    //    printf("   Seen:  %s=%s\n",key,data);
-    if (strcmp(key,data)) {
-      printf("Key(%s) != value(%s). Abording\n",key,data);
-      abort();
-    }
+    /*    printf("   Seen:  %s=%s\n",key,data); */
+    gras_assert2 (!strcmp(key,data),
+      "Key(%s) != value(%s). Abording\n",key,data);
   }
   return no_error;
 }
@@ -48,8 +48,6 @@ static gras_error_t countelems(gras_dict_t *head,int*count) {
   return no_error;
 }
 
-void parse_log_opt(int argc, char **argv, const char *deft);
-
 int main(int argc,char **argv) {
   gras_error_t errcode;
   gras_dict_t *head=NULL;
@@ -57,7 +55,7 @@ int main(int argc,char **argv) {
   char *key;
   void *data;
 
-  parse_log_opt(argc,argv,"dict.thresh=verbose");
+  gras_init_defaultlog(&argc,argv,"dict.thresh=verbose");
   srand((unsigned int)time(NULL));
 
   printf("Dictionnary: CRASH test:\n");
@@ -66,7 +64,7 @@ int main(int argc,char **argv) {
   printf(" (a point is a test)\n");
 
   for (i=0;i<20;i++) {
-    TRYFAIL(gras_dict_new(&head));
+    head=gras_dict_new();
     if (i%10) printf("."); else printf("%d",i/10); fflush(stdout);
     nb=0;
     for (j=0;j<1000;j++) {
@@ -78,11 +76,11 @@ int main(int argc,char **argv) {
       for (k=0;k<SIZEOFKEY-1;k++)
 	key[k]=rand() % ('z' - 'a') + 'a';
       key[k]='\0';
-      //      printf("[%d %s]\n",j,key);
-      TRYFAIL(gras_dict_insert(head,key,key,&free));
+      /*      printf("[%d %s]\n",j,key); */
+      gras_dict_set(head,key,key,&free);
     }
     nb=0;
-    //    gras_dict_dump(head,(void (*)(void*))&printf);
+    /*    gras_dict_dump(head,(void (*)(void*))&printf); */
     TRYFAIL(countelems(head,&nb));
     if (nb != 1000) {
        printf ("\nI found %d elements, and not 1000\n",nb);
@@ -93,11 +91,11 @@ int main(int argc,char **argv) {
   }
 
 
-  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");
+  head=gras_dict_new();
+  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)) {
+    if (!(j%1000)) {
       printf("."); 
       fflush(stdout);
     }
@@ -107,14 +105,14 @@ int main(int argc,char **argv) {
     }
     
     sprintf(key,"%d",j);
-    TRYFAIL(gras_dict_insert(head,key,key,&free));
+    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();
@@ -124,18 +122,19 @@ int main(int argc,char **argv) {
     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);
@@ -144,10 +143,13 @@ int main(int argc,char **argv) {
     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);
+  
+  gras_exit();
   return 0;
 }