X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/097772060203ef41e44147474465a3a1707f4891..0205b326c723f3abd65db0947056760202cabc2e:/testsuite/gras/datadesc_usage.c?ds=sidebyside

diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c
index bb82397bfb..5ff53f0974 100644
--- a/testsuite/gras/datadesc_usage.c
+++ b/testsuite/gras/datadesc_usage.c
@@ -2,17 +2,16 @@
 
 /* datadesc: test of data description (using file transport).               */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 the OURAGAN project.                                  */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
-#include "../DataDesc/datadesc_interface.h"
-GRAS_LOG_NEW_DEFAULT_CATEGORY(test);
+#include "gras/DataDesc/datadesc_interface.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 
 #define READ  0
 #define WRITE 1
@@ -21,20 +20,21 @@ GRAS_LOG_NEW_DEFAULT_CATEGORY(test);
 int r_arch;
 const char *filename = "datadesc_usage.out";  
 
-gras_error_t
-write_read(gras_datadesc_type_t *type,void *src, void *dst, 
-	   gras_socket_t *sock, int direction);
+xbt_error_t
+write_read(gras_datadesc_type_t type,void *src, void *dst, 
+	   gras_socket_t sock, int direction);
 
-gras_error_t
-write_read(gras_datadesc_type_t *type,void *src, void *dst, 
-	   gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t
+write_read(gras_datadesc_type_t type,void *src, void *dst, 
+	   gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
    
   /* write */
   if (direction == RW) 
     TRY(gras_socket_client_from_file(filename,&sock));
   if (direction == WRITE || direction == RW)
     TRY(gras_datadesc_send(sock, type, src));
+/*  TRY(gras_datadesc_gen_send(sock, type, src));*/
   if (direction == RW) 
     gras_socket_close(sock);
    
@@ -51,66 +51,66 @@ write_read(gras_datadesc_type_t *type,void *src, void *dst,
   return no_error;
 }
 
-gras_error_t test_int(gras_socket_t *sock, int direction);
-gras_error_t test_float(gras_socket_t *sock, int direction);
-gras_error_t test_double(gras_socket_t *sock, int direction);
-gras_error_t test_array(gras_socket_t *sock, int direction);
-gras_error_t test_intref(gras_socket_t *sock, int direction);
-gras_error_t test_string(gras_socket_t *sock, int direction);
+xbt_error_t test_int(gras_socket_t sock, int direction);
+xbt_error_t test_float(gras_socket_t sock, int direction);
+xbt_error_t test_double(gras_socket_t sock, int direction);
+xbt_error_t test_array(gras_socket_t sock, int direction);
+xbt_error_t test_intref(gras_socket_t sock, int direction);
+xbt_error_t test_string(gras_socket_t sock, int direction);
 
-gras_error_t test_homostruct(gras_socket_t *sock, int direction);
-gras_error_t test_hetestruct(gras_socket_t *sock, int direction);
-gras_error_t test_nestedstruct(gras_socket_t *sock, int direction);
-gras_error_t test_chain_list(gras_socket_t *sock, int direction);
-gras_error_t test_graph(gras_socket_t *sock, int direction);
+xbt_error_t test_homostruct(gras_socket_t sock, int direction);
+xbt_error_t test_hetestruct(gras_socket_t sock, int direction);
+xbt_error_t test_nestedstruct(gras_socket_t sock, int direction);
+xbt_error_t test_chain_list(gras_socket_t sock, int direction);
+xbt_error_t test_graph(gras_socket_t sock, int direction);
 
-gras_error_t test_pbio(gras_socket_t *sock, int direction);
-gras_error_t test_clause(gras_socket_t *sock, int direction);
+xbt_error_t test_pbio(gras_socket_t sock, int direction);
+xbt_error_t test_clause(gras_socket_t sock, int direction);
 
 /* defined in datadesc_structures.c, which in perl generated */
-gras_error_t test_structures(gras_socket_t *sock, int direction); 
+xbt_error_t test_structures(gras_socket_t sock, int direction); 
 
 
 
-gras_error_t test_int(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t test_int(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   int i=5,j;
   
   INFO0("---- Test on integer ----");
   TRY(write_read(gras_datadesc_by_name("int"), &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(i == j);
+    xbt_assert(i == j);
   }
   return no_error;
 }
-gras_error_t test_float(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t test_float(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   float i=5.0,j;
   
   INFO0("---- Test on float ----");
   TRY(write_read(gras_datadesc_by_name("float"), &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert2(i == j,"%f != %f",i,j);
+    xbt_assert2(i == j,"%f != %f",i,j);
   }
   return no_error;
 }
-gras_error_t test_double(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t test_double(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   double i=-3252355.1234,j;
   
   INFO0("---- Test on double ----");
   TRY(write_read(gras_datadesc_by_name("double"), &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert2(i == j,"%f != %f",i,j);
+    xbt_assert2(i == j,"%f != %f",i,j);
   }
   return no_error;
 }
 
 #define SIZE 5
 typedef int array[SIZE];
-gras_error_t test_array(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type;
+xbt_error_t test_array(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type;
   
   array i = { 35212,-6226,74337,11414,7733};
   array j;
@@ -118,36 +118,35 @@ gras_error_t test_array(gras_socket_t *sock, int direction) {
 
   INFO0("---- Test on fixed array ----");
 
-  TRY(gras_datadesc_declare_array_fixed("fixed int array", 
-					gras_datadesc_by_name("int"),
-					SIZE, &my_type));
+  my_type=gras_datadesc_array_fixed("fixed int array", 
+				    gras_datadesc_by_name("int"),
+				    SIZE);
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
     for (cpt=0; cpt<SIZE; cpt++) {
       DEBUG1("Test spot %d",cpt);
-      gras_assert4(i[cpt] == j[cpt],"i[%d]=%d  !=  j[%d]=%d",
+      xbt_assert4(i[cpt] == j[cpt],"i[%d]=%d  !=  j[%d]=%d",
 		   cpt,i[cpt],cpt,j[cpt]);
     }
   }
   return no_error;
 }
-gras_error_t test_intref(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type;
+xbt_error_t test_intref(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type;
   int *i,*j;
   
-  if (! (i=malloc(sizeof(int))) )
-    RAISE_MALLOC;
+  i=xbt_new(int,1);
   *i=12345;
 
   INFO1("---- Test on a reference to an integer (%p) ----",i);
 
-  TRY(gras_datadesc_declare_ref("int*",gras_datadesc_by_name("int"),&my_type));
+  my_type = gras_datadesc_ref("int*",gras_datadesc_by_name("int"));
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(*i == *j);
+    xbt_assert(*i == *j);
     free(j);
   }
   free(i);
@@ -157,9 +156,9 @@ gras_error_t test_intref(gras_socket_t *sock, int direction) {
 /***
  *** string (dynamic array)
  ***/ 
-gras_error_t test_string(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  char *i=strdup("Some data"), *j=NULL;
+xbt_error_t test_string(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  char *i=xbt_strdup("Some data"), *j=NULL;
   int cpt;
   
   INFO0("---- Test on string (ref to dynamic array) ----");
@@ -167,7 +166,7 @@ gras_error_t test_string(gras_socket_t *sock, int direction) {
 		 sock,direction));
   if (direction == READ || direction == RW) {
     for (cpt=0; cpt<strlen(i); cpt++) {
-      gras_assert4(i[cpt] == j[cpt],"i[%d]=%c  !=  j[%d]=%c",
+      xbt_assert4(i[cpt] == j[cpt],"i[%d]=%c  !=  j[%d]=%c",
 		   cpt,i[cpt],cpt,j[cpt]);
     } 
     free(j);
@@ -183,39 +182,37 @@ gras_error_t test_string(gras_socket_t *sock, int direction) {
 typedef struct {
   int a,b,c,d;
 } homostruct;
-gras_error_t test_homostruct(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type;
+xbt_error_t test_homostruct(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type;
   homostruct *i, *j; 
 
   INFO0("---- Test on homogeneous structure ----");
   /* create descriptor */
-  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")));
-  gras_datadesc_declare_struct_close(my_type);
-  TRY(gras_datadesc_declare_ref("homostruct*",
-				gras_datadesc_by_name("homostruct"),
-				&my_type));
+  my_type=gras_datadesc_struct("homostruct");
+  gras_datadesc_struct_append(my_type,"a",
+			      gras_datadesc_by_name("signed int"));
+  gras_datadesc_struct_append(my_type,"b",
+			      gras_datadesc_by_name("int"));
+  gras_datadesc_struct_append(my_type,"c",
+			      gras_datadesc_by_name("int"));
+  gras_datadesc_struct_append(my_type,"d",
+			      gras_datadesc_by_name("int"));
+  gras_datadesc_struct_close(my_type);
+  my_type=gras_datadesc_ref("homostruct*",
+			    gras_datadesc_by_name("homostruct"));
 
   /* init a value, exchange it and check its validity*/
-  if (! (i=malloc(sizeof(homostruct))) )
-    RAISE_MALLOC;
+  i=xbt_new(homostruct,1);
   i->a = 2235;    i->b = 433425;
   i->c = -23423;  i->d = -235235;
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(i->a == j->a);
-    gras_assert(i->b == j->b);
-    gras_assert(i->c == j->c);
-    gras_assert(i->d == j->d);
+    xbt_assert2(i->a == j->a,"i->a=%d != j->a=%d",i->a,j->a);
+    xbt_assert(i->b == j->b);
+    xbt_assert(i->c == j->c);
+    xbt_assert(i->d == j->d);
     free(j);
   }
   free(i);
@@ -231,39 +228,37 @@ typedef struct {
   unsigned char c2;
   unsigned long int l2;
 } hetestruct;
-gras_error_t test_hetestruct(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type;
+xbt_error_t test_hetestruct(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type;
   hetestruct *i, *j; 
 
   INFO0("---- Test on heterogeneous structure ----");
   /* create descriptor */
-  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")));
-  gras_datadesc_declare_struct_close(my_type);
-  TRY(gras_datadesc_declare_ref("hetestruct*",
-				gras_datadesc_by_name("hetestruct"),
-				&my_type));
+  my_type=gras_datadesc_struct("hetestruct");
+  gras_datadesc_struct_append(my_type,"c1",
+			      gras_datadesc_by_name("unsigned char"));
+  gras_datadesc_struct_append(my_type,"l1",
+			      gras_datadesc_by_name("unsigned long int"));
+  gras_datadesc_struct_append(my_type,"c2",
+			      gras_datadesc_by_name("unsigned char"));
+  gras_datadesc_struct_append(my_type,"l2",
+			      gras_datadesc_by_name("unsigned long int"));
+  gras_datadesc_struct_close(my_type);
+  my_type=gras_datadesc_ref("hetestruct*", gras_datadesc_by_name("hetestruct"));
+
 
   /* init a value, exchange it and check its validity*/
-  if (! (i=malloc(sizeof(hetestruct))) )
-    RAISE_MALLOC;
+  i=xbt_new(hetestruct,1);
   i->c1 = 's'; i->l1 = 123455;
   i->c2 = 'e'; i->l2 = 774531;
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(i->c1 == j->c1);
-    gras_assert(i->c2 == j->c2);
-    gras_assert2(i->l1 == j->l1,"i->l1(=%ld)  !=  j->l1(=%ld)",i->l1,j->l1);
-    gras_assert(i->l2 == j->l2);
+    xbt_assert(i->c1 == j->c1);
+    xbt_assert(i->c2 == j->c2);
+    xbt_assert2(i->l1 == j->l1,"i->l1(=%ld)  !=  j->l1(=%ld)",i->l1,j->l1);
+    xbt_assert(i->l2 == j->l2);
     free(j);
   }
   free(i);
@@ -277,27 +272,24 @@ typedef struct {
   hetestruct hete;
   homostruct homo;
 } nestedstruct;
-gras_error_t test_nestedstruct(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type;
+xbt_error_t test_nestedstruct(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type;
   nestedstruct *i, *j; 
 
   INFO0("---- Test on nested structures ----");
   /* create descriptor */
-  TRY(gras_datadesc_declare_struct("nestedstruct",&my_type));
+  my_type=gras_datadesc_struct("nestedstruct");
 
-  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")));
-  gras_datadesc_declare_struct_close(my_type);
-  TRY(gras_datadesc_declare_ref("nestedstruct*",
-				gras_datadesc_by_name("nestedstruct"),
-				&my_type));
+  gras_datadesc_struct_append(my_type,"hete",
+			      gras_datadesc_by_name("hetestruct"));
+  gras_datadesc_struct_append(my_type,"homo",
+			      gras_datadesc_by_name("homostruct"));
+  gras_datadesc_struct_close(my_type);
+  my_type=gras_datadesc_ref("nestedstruct*", gras_datadesc_by_name("nestedstruct"));
 
   /* init a value, exchange it and check its validity*/
-  if (! (i=malloc(sizeof(nestedstruct))) )
-    RAISE_MALLOC;
+  i=xbt_new(nestedstruct,1);
   i->homo.a = 235231;  i->homo.b = -124151;
   i->homo.c = 211551;  i->homo.d = -664222;
   i->hete.c1 = 's'; i->hete.l1 = 123455;
@@ -305,14 +297,14 @@ gras_error_t test_nestedstruct(gras_socket_t *sock, int direction) {
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(i->homo.a == j->homo.a);
-    gras_assert(i->homo.b == j->homo.b);
-    gras_assert(i->homo.c == j->homo.c);
-    gras_assert(i->homo.d == j->homo.d);
-    gras_assert(i->hete.c1 == j->hete.c1);
-    gras_assert(i->hete.c2 == j->hete.c2);
-    gras_assert(i->hete.l1 == j->hete.l1);
-    gras_assert(i->hete.l2 == j->hete.l2);
+    xbt_assert(i->homo.a == j->homo.a);
+    xbt_assert(i->homo.b == j->homo.b);
+    xbt_assert(i->homo.c == j->homo.c);
+    xbt_assert(i->homo.d == j->homo.d);
+    xbt_assert(i->hete.c1 == j->hete.c1);
+    xbt_assert(i->hete.c2 == j->hete.c2);
+    xbt_assert(i->hete.l1 == j->hete.l1);
+    xbt_assert(i->hete.l2 == j->hete.l2);
     free(j);
   }
   free(i);
@@ -327,28 +319,27 @@ struct s_chained_list {
   int          v;
   chained_list_t *l;
 };
-gras_error_t declare_chained_list_type(void);
+xbt_error_t declare_chained_list_type(void);
 chained_list_t *cons(int v, chained_list_t *l);
 void list_free(chained_list_t *l);
 int list_eq(chained_list_t*i,chained_list_t*j);
 
-gras_error_t declare_chained_list_type(void) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *my_type,*ref_my_type;
+xbt_error_t declare_chained_list_type(void) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t my_type,ref_my_type;
 
-  TRY(gras_datadesc_declare_struct("chained_list_t",&my_type));
-  TRY(gras_datadesc_declare_ref("chained_list_t*",my_type,&ref_my_type));
+  my_type=gras_datadesc_struct("chained_list_t");
+  ref_my_type=gras_datadesc_ref("chained_list_t*",my_type);
 
-  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));
-  gras_datadesc_declare_struct_close(my_type);
+  gras_datadesc_struct_append(my_type,"v", gras_datadesc_by_name("int"));
+  gras_datadesc_struct_append(my_type,"l", ref_my_type);
+  gras_datadesc_struct_close(my_type);
 
   return no_error;
 }
 
 chained_list_t * cons(int v, chained_list_t *l) {
-  chained_list_t *nl = malloc(sizeof (chained_list_t));
+  chained_list_t *nl = xbt_new(chained_list_t,1);
   
   nl->v = v;
   nl->l = l;
@@ -367,8 +358,8 @@ int list_eq(chained_list_t*i,chained_list_t*j) {
     return 0;
   return list_eq(i->l, j->l); 
 }
-gras_error_t test_chain_list(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t test_chain_list(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   chained_list_t *i, *j; 
 
   INFO0("---- Test on chained list ----");
@@ -381,7 +372,7 @@ gras_error_t test_chain_list(gras_socket_t *sock, int direction) {
 		 &i,&j,
 		 sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(list_eq(i,j));    
+    xbt_assert(list_eq(i,j));    
     list_free(j);
   }
 
@@ -391,8 +382,8 @@ gras_error_t test_chain_list(gras_socket_t *sock, int direction) {
 /***
  *** graph
  ***/
-gras_error_t test_graph(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
+xbt_error_t test_graph(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   chained_list_t *i, *j; 
 
   INFO0("---- Test on graph (cyclique chained list) ----");
@@ -401,6 +392,7 @@ gras_error_t test_graph(gras_socket_t *sock, int direction) {
   i->l->l->l = i;
   j = NULL;
 
+  gras_datadesc_cycle_set(gras_datadesc_by_name("chained_list_t*"));
   TRY(write_read(gras_datadesc_by_name("chained_list_t*"),
 		 &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
@@ -413,14 +405,14 @@ gras_error_t test_graph(gras_socket_t *sock, int direction) {
     DEBUG1("j->l=%p"      ,j->l);
     DEBUG1("j->l->l=%p"   ,j->l->l);
     DEBUG1("j->l->l->l=%p",j->l->l->l);
-    gras_assert4(j->l->l->l == j,
+    xbt_assert4(j->l->l->l == j,
 		 "Received list is not cyclic. j=%p != j->l->l->l=%p\n"
 		 "j=%p; &j=%p",
 		 j,j->l->l->l, 
 		 j ,&j);
     j->l->l->l = NULL;
     i->l->l->l = NULL;
-    gras_assert(list_eq(i,j));
+    xbt_assert(list_eq(i,j));
 
     list_free(j);
   }
@@ -449,153 +441,118 @@ struct s_pbio{ /* structure presented in the IEEE article */
 };
 		 )
 typedef struct s_pbio pbio_t;
+pbio_t pbio_i, pbio_j;
 
-gras_error_t test_pbio(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  pbio_t i,j;
+xbt_error_t test_pbio(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
   int cpt;
   int cpt2;
-  gras_datadesc_type_t *pbio_type;
+  gras_datadesc_type_t pbio_type;
 
   INFO0("---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----");
   pbio_type = gras_datadesc_by_symbol(s_pbio);
 
   /* Fill in that damn struct */
-  i.Cnstatv = 325115;
+  pbio_i.Cnstatv = 325115;
   for (cpt=0; cpt<12; cpt++) 
-    i.Cstatev[cpt] = ((double) cpt) * -2361.11;
-  i.Cnprops = -37373;
+    pbio_i.Cstatev[cpt] = ((double) cpt) * -2361.11;
+  pbio_i.Cnprops = -37373;
   for (cpt=0; cpt<110; cpt++)
-    i.Cprops[cpt] = cpt * 100.0;
+    pbio_i.Cprops[cpt] = cpt * 100.0;
   for (cpt=0; cpt<4; cpt++)
-    i.Cndi[cpt] = cpt * 23262;
-  i.Cnshr = -4634;
-  i.Cnpt = 114142;
-  i.Cdtime = -11515.662;
-  i.Ctime[0] = 332523.226;
-  i.Ctime[1] = -26216.113;
-  i.Cntens = 235211411;
+    pbio_i.Cndi[cpt] = cpt * 23262;
+  pbio_i.Cnshr = -4634;
+  pbio_i.Cnpt = 114142;
+  pbio_i.Cdtime = -11515.662;
+  pbio_i.Ctime[0] = 332523.226;
+  pbio_i.Ctime[1] = -26216.113;
+  pbio_i.Cntens = 235211411;
   
   for (cpt=0; cpt<3; cpt++) {
     for (cpt2=0; cpt2<373; cpt2++)
-      i.Cdfgrd0[cpt2][cpt] = ((double)cpt) * ((double)cpt2);
+      pbio_i.Cdfgrd0[cpt2][cpt] = ((double)cpt) * ((double)cpt2);
     for (cpt2=0; cpt2<3; cpt2++)
-      i.Cdfgrd1[cpt][cpt2] = -((double)cpt) * ((double)cpt2);
+      pbio_i.Cdfgrd1[cpt][cpt2] = -((double)cpt) * ((double)cpt2);
   }
   for (cpt=0; cpt<106; cpt++) {
-    i.Cstress[cpt]=(double)cpt * 22.113;
+    pbio_i.Cstress[cpt]=(double)cpt * 22.113;
     for (cpt2=0; cpt2<106; cpt2++) 
-      i.Cddsdde[cpt][cpt2] = ((double)cpt) * ((double)cpt2);
+      pbio_i.Cddsdde[cpt][cpt2] = ((double)cpt) * ((double)cpt2);
   }
   TRY(write_read(gras_datadesc_by_symbol(s_pbio),
-		 &i,&j, sock,direction));
+		 &pbio_i,&pbio_j, sock,direction));
   if (direction == READ || direction == RW) {
     /* Check that the data match */
-    gras_assert(i.Cnstatv == j.Cnstatv);
+    xbt_assert(pbio_i.Cnstatv == pbio_j.Cnstatv);
     for (cpt=0; cpt<12; cpt++)
-      gras_assert(i.Cstatev[cpt] == j.Cstatev[cpt]);
-    gras_assert(i.Cnprops == j.Cnprops);
+      xbt_assert4(pbio_i.Cstatev[cpt] == pbio_j.Cstatev[cpt],
+		  "i.Cstatev[%d] (=%f) != j.Cstatev[%d] (=%f)",
+		  cpt,pbio_i.Cstatev[cpt],cpt,pbio_j.Cstatev[cpt]);
+    xbt_assert(pbio_i.Cnprops == pbio_j.Cnprops);
     for (cpt=0; cpt<110; cpt++)
-      gras_assert(i.Cprops[cpt] == j.Cprops[cpt]);
+      xbt_assert(pbio_i.Cprops[cpt] == pbio_j.Cprops[cpt]);
     for (cpt=0; cpt<4; cpt++) 
-      gras_assert(i.Cndi[cpt] == j.Cndi[cpt]);
-    gras_assert(i.Cnshr == j.Cnshr);
-    gras_assert(i.Cnpt == j.Cnpt);
-    gras_assert(i.Cdtime == j.Cdtime);
-    gras_assert(i.Ctime[0] == j.Ctime[0]);
-    gras_assert(i.Ctime[1] == j.Ctime[1]);
-    gras_assert(i.Cntens == j.Cntens);
+      xbt_assert(pbio_i.Cndi[cpt] == pbio_j.Cndi[cpt]);
+    xbt_assert(pbio_i.Cnshr == pbio_j.Cnshr);
+    xbt_assert(pbio_i.Cnpt == pbio_j.Cnpt);
+    xbt_assert(pbio_i.Cdtime == pbio_j.Cdtime);
+    xbt_assert(pbio_i.Ctime[0] == pbio_j.Ctime[0]);
+    xbt_assert(pbio_i.Ctime[1] == pbio_j.Ctime[1]);
+    xbt_assert(pbio_i.Cntens == pbio_j.Cntens);
     for (cpt=0; cpt<3; cpt++) {
       for (cpt2=0; cpt2<373; cpt2++)
-	gras_assert(i.Cdfgrd0[cpt2][cpt] == j.Cdfgrd0[cpt2][cpt]);
+	xbt_assert(pbio_i.Cdfgrd0[cpt2][cpt] == pbio_j.Cdfgrd0[cpt2][cpt]);
       for (cpt2=0; cpt2<3; cpt2++)
-	gras_assert(i.Cdfgrd1[cpt][cpt2] == j.Cdfgrd1[cpt][cpt2]);
+	xbt_assert(pbio_i.Cdfgrd1[cpt][cpt2] == pbio_j.Cdfgrd1[cpt][cpt2]);
     }
     for (cpt=0; cpt<106; cpt++) {
-      gras_assert(i.Cstress[cpt] == j.Cstress[cpt]);
+      xbt_assert(pbio_i.Cstress[cpt] == pbio_j.Cstress[cpt]);
       for (cpt2=0; cpt2<106; cpt2++) 
-	gras_assert4(i.Cddsdde[cpt][cpt2] == j.Cddsdde[cpt][cpt2],
+	xbt_assert4(pbio_i.Cddsdde[cpt][cpt2] == pbio_j.Cddsdde[cpt][cpt2],
 		     "%f=i.Cddsdde[%d][%d] != j.Cddsdde[cpt][cpt2]=%f",
-		     i.Cddsdde[cpt][cpt2],cpt,cpt2,j.Cddsdde[cpt][cpt2]);
+		     pbio_i.Cddsdde[cpt][cpt2],cpt,cpt2,pbio_j.Cddsdde[cpt][cpt2]);
     }
   }
 
   return no_error;
 }
 
-typedef struct {
-   int num_lits; /* size of next array */
-   int* literals;
-} Clause;
-
-void Clause_pre_cb  (void *vars,gras_datadesc_type_t *p_type,void *data);
-int  Clause_num_lits(void *vars,gras_datadesc_type_t *p_type,void *data);
-
-void Clause_pre_cb(void *vars,
-		   gras_datadesc_type_t *p_type,
-		   void *data) {
-  Clause c=*(Clause*)data;
-  int *count=malloc(sizeof(int));
-  *count=c.num_lits;
-
-  gras_dd_cbps_push(vars,"num_lits",count,
-		    gras_datadesc_by_name("int"));
-  DEBUG2("writen data=%p (got %p)",count,data);
-  DEBUG1("writen count=%d",*count);
-}
-
-int Clause_num_lits(void *vars,
-		    gras_datadesc_type_t *p_type,
-		    void *data) {
-  //  int *res;
-  gras_datadesc_type_t *ddt;
-  void *d = gras_dd_cbps_get (vars,"num_lits",&ddt);
-  DEBUG1("read data=%p",d);
-  DEBUG1("read count=%d",*(int*)d);
-  return *(int*)d;
-}
+GRAS_DEFINE_TYPE(s_clause,
+struct s_clause {
+   int num_lits;
+   int *literals GRAS_ANNOTE(size,num_lits); /* Tells GRAS where to find the size */
+};)
+typedef struct s_clause Clause;
 
-gras_error_t test_clause(gras_socket_t *sock, int direction) {
-  gras_error_t errcode;
-  gras_datadesc_type_t *ddt,*array_t;
+xbt_error_t test_clause(gras_socket_t sock, int direction) {
+  xbt_error_t errcode;
+  gras_datadesc_type_t ddt,array_t;
   Clause *i,*j;
   int cpt;
   
   INFO0("---- Test on struct containing dynamic array and its size (cbps test) ----");
 
   /* create and fill the struct */
-  if (! (i=malloc(sizeof(Clause))) )
-    RAISE_MALLOC;
+  i=xbt_new(Clause,1);
 
   i->num_lits = 5432;
-  if (! (i->literals = malloc(sizeof(int) * i->num_lits)) )
-    RAISE_MALLOC;
+  i->literals = xbt_new(int, i->num_lits);
   for (cpt=0; cpt<i->num_lits; cpt++)
     i->literals[cpt] = cpt * cpt - ((cpt * cpt) / 2);
   DEBUG3("created data=%p (within %p @%p)",&(i->num_lits),i,&i);
   DEBUG1("created count=%d",i->num_lits);
 
   /* create the damn type descriptor */
-  TRYFAIL(gras_datadesc_declare_struct("Clause",&ddt));
-  gras_datadesc_cb_set_pre(ddt,Clause_pre_cb);
-  
-  TRYFAIL(gras_datadesc_declare_struct_append(ddt,"num_lits",
-					      gras_datadesc_by_name("int")));
-
-  TRYFAIL(gras_datadesc_declare_array_dyn("Clause{int[]}",
-					  gras_datadesc_by_name("int"),
-					  Clause_num_lits,
-					  &array_t));
-  TRYFAIL(gras_datadesc_declare_ref("Clause{int[]}*",array_t,&array_t));
-  TRYFAIL(gras_datadesc_declare_struct_append(ddt,"literals",array_t));
-  gras_datadesc_declare_struct_close(ddt);
-  TRYFAIL(gras_datadesc_declare_ref("Clause*",ddt,&ddt));
+  ddt = gras_datadesc_by_symbol(s_clause);
+/*  gras_datadesc_type_dump(ddt); */
+
+  ddt=gras_datadesc_ref("Clause*",ddt);
 
   TRY(write_read(ddt, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    gras_assert(i->num_lits == j->num_lits);
+    xbt_assert(i->num_lits == j->num_lits);
     for (cpt=0; cpt<i->num_lits; cpt++)
-      gras_assert(i->literals[cpt] == j->literals[cpt]);
+      xbt_assert(i->literals[cpt] == j->literals[cpt]);
     
     free(j->literals);
     free(j);
@@ -606,13 +563,13 @@ gras_error_t test_clause(gras_socket_t *sock, int direction) {
 }
 
 int main(int argc,char *argv[]) {
-  gras_error_t errcode;
-  gras_socket_t *sock;
+  xbt_error_t errcode;
+  gras_socket_t sock;
   int direction = RW;
   int cpt;
   char r_arch_char = gras_arch_selfid();
 
-  gras_init_defaultlog(&argc,argv,NULL);
+  gras_init(&argc,argv,NULL);
 
   for (cpt=1; cpt<argc; cpt++) {
     if (!strcmp(argv[cpt], "--read")) {
@@ -647,7 +604,7 @@ int main(int argc,char *argv[]) {
   
   TRYFAIL(test_string(sock,direction)); 
 
-  TRYFAIL(test_structures(sock,direction));
+     TRYFAIL(test_structures(sock,direction));
 
   TRYFAIL(test_homostruct(sock,direction));
   TRYFAIL(test_hetestruct(sock,direction));
@@ -655,7 +612,7 @@ int main(int argc,char *argv[]) {
 
   TRYFAIL(declare_chained_list_type());
   TRYFAIL(test_chain_list(sock,direction));
-  TRYFAIL(test_graph(sock,direction));
+  TRYFAIL(test_graph(sock,direction)); 
 
   TRYFAIL(test_pbio(sock,direction));