X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bbfe6dff09cff639aaab8fd2898678a5a630c2b..7d6b04b29fa0fbad39c672e0c6532747270df7ce:/testsuite/gras/datadesc_usage.c

diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c
index 2a6507bf26..144e17f73d 100644
--- a/testsuite/gras/datadesc_usage.c
+++ b/testsuite/gras/datadesc_usage.c
@@ -49,24 +49,20 @@ gras_error_t test_graph(void);
 
 gras_error_t test_int(void) {
   gras_error_t errcode;
-  gras_datadesc_type_t *type;
   int i=5,*j=NULL;
   
   INFO0("==== Test on integer ====");
-  TRY(gras_datadesc_by_name("int", &type));
-  TRY(write_read(type, (void*)&i,(void**) &j));
+  TRY(write_read(gras_datadesc_by_name("int"), (void*)&i,(void**) &j));
   gras_assert(i == *j);
   free(j);
   return no_error;
 }
 gras_error_t test_float(void) {
   gras_error_t errcode;
-  gras_datadesc_type_t *type;
   float i=5.0,*j=NULL;
   
   INFO0("==== Test on float ====");
-  TRY(gras_datadesc_by_name("float", &type));
-  TRY(write_read(type, (void*)&i,(void**) &j));
+  TRY(write_read(gras_datadesc_by_name("float"), (void*)&i,(void**) &j));
   gras_assert(i == *j);
   free(j);
   return no_error;
@@ -76,11 +72,9 @@ gras_error_t test_float(void) {
 typedef int array[SIZE];
 gras_error_t test_array(void) {
   gras_error_t errcode;
-  gras_datadesc_type_t *int_type;
   gras_datadesc_type_t *my_type;
   
   array i,*j;
-  long int code;
   int cpt;
 
   INFO0("==== Test on fixed array ====");
@@ -89,9 +83,9 @@ gras_error_t test_array(void) {
   }
   j=NULL;
 
-  TRY(gras_datadesc_by_name("int", &int_type));
-  TRY(gras_datadesc_declare_array("fixed array of int", int_type, 5, &code));
-  TRY(gras_datadesc_by_code(code,&my_type));
+  TRY(gras_datadesc_declare_array_fixed("fixed int array", 
+					gras_datadesc_by_name("int"),
+					5, &my_type));
 
   TRY(write_read(my_type, (void*)&i,(void**) &j));
   for (cpt=0; cpt<SIZE; cpt++)
@@ -101,19 +95,15 @@ gras_error_t test_array(void) {
 }
 gras_error_t test_intref(void) {
   gras_error_t errcode;
-  gras_datadesc_type_t *int_type;
   gras_datadesc_type_t *my_type;
   int *i,**j=NULL;
-  long int code;
   
   if (! (i=malloc(sizeof(int))) )
     RAISE_MALLOC;
   *i=45;
   INFO1("==== Test on a reference to an integer (%p) ====",i);
 
-  TRY(gras_datadesc_by_name("int", &int_type));
-  TRY(gras_datadesc_declare_ref("int*",int_type,&code));
-  TRY(gras_datadesc_by_code(code,&my_type));
+  TRY(gras_datadesc_declare_ref("int*",gras_datadesc_by_name("int"),&my_type));
 
   TRY(write_read(my_type, (void*)&i,(void**) &j));
   gras_assert(*i == **j);
@@ -127,15 +117,13 @@ gras_error_t test_intref(void) {
 typedef char *string;
 gras_error_t test_string(void) {
   gras_error_t errcode;
-  gras_datadesc_type_t *type;
-  string i=strdup("Some data");
-  string *j=NULL;
+  char *i=strdup("Some data");
+  char *j=NULL;
   
   INFO0("==== Test on string (dynamic array) ====");
-  TRY(gras_datadesc_by_name("string", &type));
-  TRY(write_read(type, (void*)&i,(void**) &j));
-  gras_assert(!strcmp(i,*j));
-  free(*j);
+  TRY(write_read(gras_datadesc_by_name("string"), (void*)i,(void**) &j));
+  gras_assert(!strcmp(i,j));
+  free(j);
   return no_error;
 }
 
@@ -149,17 +137,19 @@ typedef struct {
 gras_error_t test_homostruct(void) {
   gras_error_t errcode;
   gras_datadesc_type_t *my_type;
-  long int my_code;
   homostruct *i, *j; 
 
   INFO0("==== Test on homogeneous structure ====");
   /* create descriptor */
-  TRY(gras_datadesc_declare_struct("homostruct",&my_code));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"a","int"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"b","int"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"c","int"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"d","int"));
-  TRY(gras_datadesc_by_code(my_code, &my_type));
+  TRY(gras_datadesc_declare_struct("homostruct",&my_type));
+  TRY(gras_datadesc_declare_struct_append(my_type,"a",
+					  gras_datadesc_by_name("signed int")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"b",
+					  gras_datadesc_by_name("int")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"c",
+					  gras_datadesc_by_name("int")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"d",
+					  gras_datadesc_by_name("int")));
 
   /* init a value, exchange it and check its validity*/
   if (! (i=malloc(sizeof(homostruct))) )
@@ -191,17 +181,19 @@ typedef struct {
 gras_error_t test_hetestruct(void) {
   gras_error_t errcode;
   gras_datadesc_type_t *my_type;
-  long int my_code;
   hetestruct *i, *j; 
 
   INFO0("==== Test on heterogeneous structure ====");
   /* create descriptor */
-  TRY(gras_datadesc_declare_struct("hetestruct",&my_code));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"c1","unsigned char"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"l1","unsigned long int"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"c2","unsigned char"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"l2","unsigned long int"));
-  TRY(gras_datadesc_by_code(my_code, &my_type));
+  TRY(gras_datadesc_declare_struct("hetestruct",&my_type));
+  TRY(gras_datadesc_declare_struct_append(my_type,"c1",
+					  gras_datadesc_by_name("unsigned char")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"l1",
+					  gras_datadesc_by_name("unsigned long int")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"c2",
+					  gras_datadesc_by_name("unsigned char")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"l2",
+					  gras_datadesc_by_name("unsigned long int")));
 
   /* init a value, exchange it and check its validity*/
   if (! (i=malloc(sizeof(hetestruct))) )
@@ -231,15 +223,15 @@ typedef struct {
 gras_error_t test_nestedstruct(void) {
   gras_error_t errcode;
   gras_datadesc_type_t *my_type;
-  long int my_code;
   nestedstruct *i, *j; 
 
   INFO0("==== Test on nested structures ====");
   /* create descriptor */
-  TRY(gras_datadesc_declare_struct("nestedstruct",&my_code));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"hete","hetestruct"));
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"homo","homostruct"));
-  TRY(gras_datadesc_by_code(my_code, &my_type));
+  TRY(gras_datadesc_declare_struct("nestedstruct",&my_type));
+  TRY(gras_datadesc_declare_struct_append(my_type,"hete",
+					  gras_datadesc_by_name("hetestruct")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"homo",
+					  gras_datadesc_by_name("homostruct")));
 
   /* init a value, exchange it and check its validity*/
   if (! (i=malloc(sizeof(nestedstruct))) )
@@ -299,22 +291,17 @@ int list_eq(chained_list_t*i,chained_list_t*j) {
 gras_error_t test_chain_list(void) {
   gras_error_t errcode;
   gras_datadesc_type_t *my_type,*ref_my_type;
-  long int my_code;
-  long int ref_my_code;
   chained_list_t *i, *j; 
 
   INFO0("==== Test on chained list ====");
   /* create descriptor */
-  TRY(gras_datadesc_declare_struct("chained_list_t",&my_code));
-  TRY(gras_datadesc_by_code(my_code, &my_type));
-
-  TRY(gras_datadesc_declare_ref("chained_list_t*",my_type,&ref_my_code));
+  TRY(gras_datadesc_declare_struct("chained_list_t",&my_type));
+  TRY(gras_datadesc_declare_ref("chained_list_t*",my_type,&ref_my_type));
 
-  TRY(gras_datadesc_declare_struct_add_name(my_code,"v","int"));
-  TRY(gras_datadesc_declare_struct_add_code(my_code,"l",ref_my_code));
+  TRY(gras_datadesc_declare_struct_append(my_type,"v",
+					  gras_datadesc_by_name("int")));
+  TRY(gras_datadesc_declare_struct_append(my_type,"l",ref_my_type));
 
-  TRY(gras_datadesc_by_code(ref_my_code, &ref_my_type));
-      
   /* init a value, exchange it and check its validity*/
   i = cons( rand(), cons( rand() , cons( rand(), NULL)));
   j = NULL;
@@ -335,7 +322,8 @@ gras_error_t test_graph(void) {
   chained_list_t *i, *j; 
 
   INFO0("==== Test on graph (cyclique chained list) ====");
-  TRY(gras_datadesc_by_name("chained_list_t*", &my_type));
+  my_type = gras_datadesc_by_name("chained_list_t*");
+  gras_assert(my_type);
       
   /* init a value, exchange it and check its validity*/
   i = cons( rand(), cons( rand() , cons( rand(), NULL)));
@@ -376,13 +364,13 @@ typedef struct { /* structure presented in the IEEE article */
 int main(int argc,char *argv[]) {
   gras_error_t errcode;
 
-  gras_init_defaultlog(argc,argv,
+  gras_init_defaultlog(&argc,argv,
 		       "DataDesc.thresh=verbose"
 		       " test.thresh=debug"
 		       //		       " set.thresh=debug"
 		       );
 
-  /*
+
   TRYFAIL(test_int());    
   TRYFAIL(test_float());  
   TRYFAIL(test_array());  
@@ -392,9 +380,13 @@ int main(int argc,char *argv[]) {
   TRYFAIL(test_homostruct());
   TRYFAIL(test_hetestruct());
   TRYFAIL(test_nestedstruct());
-  */
+
   TRYFAIL(test_chain_list());
-  TRYFAIL(test_graph());
 
+  CRITICAL0("Not even test graphs: it dies with awfully scaring messages");
+  gras_abort();
+  //  TRYFAIL(test_graph());
+  
+  gras_exit();
   return 0;
 }