X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01021da3b27c6a5704bfa08cd0ce07be6b925e8b..c102403bfd59375027b5865880814bd2257531c0:/testsuite/gras/datadesc_usage.c

diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c
index b6ee2ad6c0..d8111415dc 100644
--- a/testsuite/gras/datadesc_usage.c
+++ b/testsuite/gras/datadesc_usage.c
@@ -2,114 +2,106 @@
 
 /* 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 "gras/DataDesc/datadesc_interface.h"
-GRAS_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 
 #define READ  0
 #define WRITE 1
-#define RW    2
+#define COPY  2
+#define RW    3
 
 int r_arch;
 const char *filename = "datadesc_usage.out";  
 
-gras_error_t
+void
 write_read(gras_datadesc_type_t type,void *src, void *dst, 
 	   gras_socket_t sock, int direction);
 
-gras_error_t
+void
 write_read(gras_datadesc_type_t type,void *src, void *dst, 
 	   gras_socket_t sock, int direction) {
-  gras_error_t errcode;
    
   /* write */
   if (direction == RW) 
-    TRY(gras_socket_client_from_file(filename,&sock));
+    sock = gras_socket_client_from_file(filename);
   if (direction == WRITE || direction == RW)
-    TRY(gras_datadesc_send(sock, type, src));
+    gras_datadesc_send(sock, type, src);
   if (direction == RW) 
     gras_socket_close(sock);
    
   /* read */
   if (direction == RW) 
-    TRY(gras_socket_server_from_file(filename,&sock));
+    sock = gras_socket_server_from_file(filename);
 
   if (direction == READ || direction == RW)
-    TRY(gras_datadesc_recv(sock, type, r_arch, dst));
+    gras_datadesc_recv(sock, type, r_arch, dst);
 
   if (direction == RW) 
     gras_socket_close(sock);
-  
-  return no_error;
+
+  if (direction == COPY)
+    gras_datadesc_copy(type, src, dst);
 }
 
-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);
+void test_int(gras_socket_t sock, int direction);
+void test_float(gras_socket_t sock, int direction);
+void test_double(gras_socket_t sock, int direction);
+void test_array(gras_socket_t sock, int direction);
+void test_dynar_scal(gras_socket_t sock, int direction);
+void test_intref(gras_socket_t sock, int direction);
+void 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);
+void test_homostruct(gras_socket_t sock, int direction);
+void test_hetestruct(gras_socket_t sock, int direction);
+void test_nestedstruct(gras_socket_t sock, int direction);
+void test_chain_list(gras_socket_t sock, int direction);
+void test_graph(gras_socket_t sock, int direction);
+void test_dynar_ref(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);
+void test_pbio(gras_socket_t sock, int direction);
+void 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); 
+void test_structures(gras_socket_t sock, int direction); 
 
 
 
-gras_error_t test_int(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_int(gras_socket_t sock, int direction) {
   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);
-  }
-  return no_error;
+  write_read(gras_datadesc_by_name("int"), &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) 
+    xbt_assert(i == j);
 }
-gras_error_t test_float(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_float(gras_socket_t sock, int direction) {
   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);
-  }
-  return no_error;
+  write_read(gras_datadesc_by_name("float"), &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY)
+    xbt_assert2(i == j,"%f != %f",i,j);
 }
-gras_error_t test_double(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_double(gras_socket_t sock, int direction) {
   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);
-  }
-  return no_error;
+  write_read(gras_datadesc_by_name("double"), &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY)
+    xbt_assert2(i == j,"%f != %f",i,j);
 }
 
 #define SIZE 5
 typedef int array[SIZE];
-gras_error_t test_array(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_array(gras_socket_t sock, int direction) {
   gras_datadesc_type_t my_type;
   
   array i = { 35212,-6226,74337,11414,7733};
@@ -122,57 +114,82 @@ gras_error_t test_array(gras_socket_t sock, int direction) {
 				    gras_datadesc_by_name("int"),
 				    SIZE);
 
-  TRY(write_read(my_type, &i,&j, sock,direction));
-  if (direction == READ || direction == RW) {
+  write_read(my_type, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
     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;
+/*** Dynar of scalar ***/
+
+void test_dynar_scal(gras_socket_t sock, int direction){
+  gras_datadesc_type_t my_type;
+  xbt_dynar_t i,j;
+  int cpt;
+   
+  INFO0("---- Test on dynar containing integers ----");
+  my_type = gras_datadesc_dynar(gras_datadesc_by_name("int"),NULL);
+  i = xbt_dynar_new(sizeof(int),NULL);
+  for (cpt=0; cpt<64; cpt++) {
+    xbt_dynar_push_as(i,int,cpt); 
+    DEBUG2("Push %d, length=%lu",cpt, xbt_dynar_length(i));
+  }
+/*  xbt_dynar_dump(i);*/
+  write_read(my_type, &i,&j, sock, direction);
+/*  xbt_dynar_dump(j);*/
+  if (direction == READ || direction == RW || direction == COPY) {
+     for (cpt=0; cpt<64; cpt++){
+	int ret=xbt_dynar_get_as(j,cpt,int);
+	if (cpt != ret) {
+	   CRITICAL3("The retrieved value for cpt=%d is not the same than the injected one (%d!=%d)",
+		     cpt,ret,cpt);
+	   xbt_abort();
+	}
+     }
+     xbt_dynar_free(&j);
+  }
+  xbt_dynar_free(&i);
+}
+void test_intref(gras_socket_t sock, int direction) {
   gras_datadesc_type_t my_type;
   int *i,*j;
   
-  i=gras_new(int,1);
+  i=xbt_new(int,1);
   *i=12345;
 
   INFO1("---- Test on a reference to an integer (%p) ----",i);
 
   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);
+  write_read(my_type, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    xbt_assert2(*i == *j,"*i != *j (%d != %d)",*i,*j);
     free(j);
   }
   free(i);
-  return no_error;
 }
 
 /***
  *** string (dynamic array)
  ***/ 
-gras_error_t test_string(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
-  char *i=gras_strdup("Some data"), *j=NULL;
+void test_string(gras_socket_t sock, int direction) {
+  char *i=xbt_strdup("Some data"), *j=NULL;
   int cpt;
   
   INFO0("---- Test on string (ref to dynamic array) ----");
-  TRY(write_read(gras_datadesc_by_name("string"), &i,&j,
-		 sock,direction));
-  if (direction == READ || direction == RW) {
+  write_read(gras_datadesc_by_name("string"), &i,&j,
+	     sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
     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);
   }
   free(i);
-  return no_error;
 }
 
 
@@ -182,8 +199,7 @@ 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;
+void test_homostruct(gras_socket_t sock, int direction) {
   gras_datadesc_type_t my_type;
   homostruct *i, *j; 
 
@@ -203,20 +219,19 @@ gras_error_t test_homostruct(gras_socket_t sock, int direction) {
 			    gras_datadesc_by_name("homostruct"));
 
   /* init a value, exchange it and check its validity*/
-  i=gras_new(homostruct,1);
+  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_assert2(i->a == j->a,"i->a=%d != j->a=%d",i->a,j->a);
-    gras_assert(i->b == j->b);
-    gras_assert(i->c == j->c);
-    gras_assert(i->d == j->d);
+  write_read(my_type, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    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);
-  return no_error;
 }
 
 /***
@@ -228,8 +243,7 @@ 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;
+void test_hetestruct(gras_socket_t sock, int direction) {
   gras_datadesc_type_t my_type;
   hetestruct *i, *j; 
 
@@ -249,20 +263,19 @@ gras_error_t test_hetestruct(gras_socket_t sock, int direction) {
 
 
   /* init a value, exchange it and check its validity*/
-  i=gras_new(hetestruct,1);
+  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);
+  write_read(my_type, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    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);
-  return no_error;
 }
 
 /***
@@ -272,8 +285,7 @@ typedef struct {
   hetestruct hete;
   homostruct homo;
 } nestedstruct;
-gras_error_t test_nestedstruct(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_nestedstruct(gras_socket_t sock, int direction) {
   gras_datadesc_type_t my_type;
   nestedstruct *i, *j; 
 
@@ -289,26 +301,25 @@ gras_error_t test_nestedstruct(gras_socket_t sock, int direction) {
   my_type=gras_datadesc_ref("nestedstruct*", gras_datadesc_by_name("nestedstruct"));
 
   /* init a value, exchange it and check its validity*/
-  i=gras_new(nestedstruct,1);
+  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;
   i->hete.c2 = 'e'; i->hete.l2 = 774531;
 
-  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);
+  write_read(my_type, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    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);
-  return no_error;
 }
 
 /***
@@ -319,13 +330,12 @@ struct s_chained_list {
   int          v;
   chained_list_t *l;
 };
-gras_error_t declare_chained_list_type(void);
+void 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;
+void declare_chained_list_type(void) {
   gras_datadesc_type_t my_type,ref_my_type;
 
   my_type=gras_datadesc_struct("chained_list_t");
@@ -334,12 +344,10 @@ gras_error_t declare_chained_list_type(void) {
   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 = gras_new(chained_list_t,1);
+  chained_list_t *nl = xbt_new(chained_list_t,1);
   
   nl->v = v;
   nl->l = l;
@@ -358,8 +366,7 @@ 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;
+void test_chain_list(gras_socket_t sock, int direction) {
   chained_list_t *i, *j; 
 
   INFO0("---- Test on chained list ----");
@@ -368,34 +375,31 @@ gras_error_t test_chain_list(gras_socket_t sock, int direction) {
   i = cons( 12355, cons( 246264 , cons( 23263, NULL)));
   j = NULL;
 
-  TRY(write_read(gras_datadesc_by_name("chained_list_t*"),
-		 &i,&j,
-		 sock,direction));
-  if (direction == READ || direction == RW) {
-    gras_assert(list_eq(i,j));    
+  write_read(gras_datadesc_by_name("chained_list_t*"),
+	     &i,&j,  sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    xbt_assert(list_eq(i,j));    
     list_free(j);
   }
 
   list_free(i);
-  return no_error;
 }
 /***
  *** graph
  ***/
-gras_error_t test_graph(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
+void test_graph(gras_socket_t sock, int direction) {
   chained_list_t *i, *j; 
 
-  INFO0("---- Test on graph (cyclique chained list) ----");
+  INFO0("---- Test on graph (cyclique chained list of 3 items) ----");
   /* init a value, exchange it and check its validity*/
   i = cons( 1151515, cons( -232362 , cons( 222552, NULL)));
   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) {
+  write_read(gras_datadesc_by_name("chained_list_t*"),
+	     &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
     
     DEBUG1("i=%p"         ,i);
     DEBUG1("i->l=%p"      ,i->l);
@@ -405,22 +409,59 @@ 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);
   }
   i->l->l->l = NULL; /* do this even in WRITE mode */
   list_free(i);
-  return no_error;
 }
 
+
+/*** Dynar of references ***/
+static void free_string(void *d){ /* used to free the data in dynar */
+     free(*(void**)d);
+}
+void test_dynar_ref(gras_socket_t sock, int direction){
+  gras_datadesc_type_t my_type;
+  xbt_dynar_t i,j;
+  char buf[1024];
+  char *s1,*s2;
+  int cpt;
+   
+  INFO0("---- Test on dynar containing integers ----");
+  my_type = gras_datadesc_dynar(gras_datadesc_by_name("string"),&free_string);
+
+  i=xbt_dynar_new(sizeof(char*),&free_string);   
+  for (cpt=0; cpt< 64; cpt++) {
+    sprintf(buf,"%d",cpt);
+    s1=strdup(buf);
+    xbt_dynar_push(i,&s1);
+  }
+
+  write_read(my_type, &i,&j, sock, direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+     for (cpt=0; cpt< 64; cpt++) {
+	sprintf(buf,"%d",cpt);
+	xbt_dynar_shift(j,&s2);
+	xbt_assert2 (!strcmp(buf,s2),
+		     "The retrieved value is not the same than the injected one (%s!=%s)",
+		     buf,s2);
+	free(s2);
+     }
+     xbt_dynar_free(&j);
+  }
+  xbt_dynar_free(&i);
+}
+
+
 /**** PBIO *****/
 GRAS_DEFINE_TYPE(s_pbio,
 struct s_pbio{ /* structure presented in the IEEE article */
@@ -442,12 +483,11 @@ struct s_pbio{ /* structure presented in the IEEE article */
 		 )
 typedef struct s_pbio pbio_t;
 
-gras_error_t test_pbio(gras_socket_t sock, int direction) {
-  gras_error_t errcode;
-  pbio_t i,j;
+void test_pbio(gras_socket_t sock, int direction) {
   int cpt;
   int cpt2;
   gras_datadesc_type_t pbio_type;
+  pbio_t i, j;
 
   INFO0("---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----");
   pbio_type = gras_datadesc_by_symbol(s_pbio);
@@ -479,40 +519,40 @@ gras_error_t test_pbio(gras_socket_t sock, int direction) {
     for (cpt2=0; cpt2<106; cpt2++) 
       i.Cddsdde[cpt][cpt2] = ((double)cpt) * ((double)cpt2);
   }
-  TRY(write_read(gras_datadesc_by_symbol(s_pbio),
-		 &i,&j, sock,direction));
-  if (direction == READ || direction == RW) {
+  write_read(gras_datadesc_by_symbol(s_pbio),
+	     &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
     /* Check that the data match */
-    gras_assert(i.Cnstatv == j.Cnstatv);
+    xbt_assert(i.Cnstatv == j.Cnstatv);
     for (cpt=0; cpt<12; cpt++)
-      gras_assert(i.Cstatev[cpt] == j.Cstatev[cpt]);
-    gras_assert(i.Cnprops == j.Cnprops);
+      xbt_assert4(i.Cstatev[cpt] == j.Cstatev[cpt],
+		  "i.Cstatev[%d] (=%f) != j.Cstatev[%d] (=%f)",
+		  cpt,i.Cstatev[cpt],cpt,j.Cstatev[cpt]);
+    xbt_assert(i.Cnprops == j.Cnprops);
     for (cpt=0; cpt<110; cpt++)
-      gras_assert(i.Cprops[cpt] == j.Cprops[cpt]);
+      xbt_assert(i.Cprops[cpt] == 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(i.Cndi[cpt] == j.Cndi[cpt]);
+    xbt_assert(i.Cnshr == j.Cnshr);
+    xbt_assert(i.Cnpt == j.Cnpt);
+    xbt_assert(i.Cdtime == j.Cdtime);
+    xbt_assert(i.Ctime[0] == j.Ctime[0]);
+    xbt_assert(i.Ctime[1] == j.Ctime[1]);
+    xbt_assert(i.Cntens == 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(i.Cdfgrd0[cpt2][cpt] == j.Cdfgrd0[cpt2][cpt]);
       for (cpt2=0; cpt2<3; cpt2++)
-	gras_assert(i.Cdfgrd1[cpt][cpt2] == j.Cdfgrd1[cpt][cpt2]);
+	xbt_assert(i.Cdfgrd1[cpt][cpt2] == j.Cdfgrd1[cpt][cpt2]);
     }
     for (cpt=0; cpt<106; cpt++) {
-      gras_assert(i.Cstress[cpt] == j.Cstress[cpt]);
+      xbt_assert(i.Cstress[cpt] == j.Cstress[cpt]);
       for (cpt2=0; cpt2<106; cpt2++) 
-	gras_assert4(i.Cddsdde[cpt][cpt2] == j.Cddsdde[cpt][cpt2],
+	xbt_assert4(i.Cddsdde[cpt][cpt2] == j.Cddsdde[cpt][cpt2],
 		     "%f=i.Cddsdde[%d][%d] != j.Cddsdde[cpt][cpt2]=%f",
 		     i.Cddsdde[cpt][cpt2],cpt,cpt2,j.Cddsdde[cpt][cpt2]);
     }
   }
-
-  return no_error;
 }
 
 GRAS_DEFINE_TYPE(s_clause,
@@ -522,19 +562,18 @@ struct s_clause {
 };)
 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;
+void test_clause(gras_socket_t sock, int direction) {
+  gras_datadesc_type_t ddt;
   Clause *i,*j;
   int cpt;
   
   INFO0("---- Test on struct containing dynamic array and its size (cbps test) ----");
 
   /* create and fill the struct */
-  i=gras_new(Clause,1);
+  i=xbt_new(Clause,1);
 
   i->num_lits = 5432;
-  i->literals = gras_new(int, i->num_lits);
+  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);
@@ -546,77 +585,79 @@ gras_error_t test_clause(gras_socket_t sock, int direction) {
 
   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);
+  write_read(ddt, &i,&j, sock,direction);
+  if (direction == READ || direction == RW || direction == COPY) {
+    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);
   }
   free(i->literals);
   free(i);
-  return no_error;
 }
 
 int main(int argc,char *argv[]) {
-  gras_error_t errcode;
-  gras_socket_t sock;
+  gras_socket_t sock=NULL;
   int direction = RW;
   int cpt;
   char r_arch_char = gras_arch_selfid();
 
-  gras_init_defaultlog(&argc,argv,NULL);
+  gras_init(&argc,argv);
 
   for (cpt=1; cpt<argc; cpt++) {
     if (!strcmp(argv[cpt], "--read")) {
       direction = READ;
     } else if (!strcmp(argv[cpt], "--write")) {
       direction = WRITE;
+    } else if (!strcmp(argv[cpt], "--copy")) {
+      direction = COPY;
     } else {
        filename=argv[cpt];
     }
   }
     
   if (direction == WRITE) {
-    TRYFAIL(gras_socket_client_from_file(filename,&sock));
-    TRY(gras_datadesc_send(sock, gras_datadesc_by_name("char"),
-			   &r_arch_char));
+    sock = gras_socket_client_from_file(filename);
+    gras_datadesc_send(sock, gras_datadesc_by_name("char"),
+		       &r_arch_char);
   }
   if (direction == READ) {
-    TRYFAIL(gras_socket_server_from_file(filename,&sock));
-    TRY(gras_datadesc_recv(sock, gras_datadesc_by_name("char"),
-			   gras_arch_selfid(), &r_arch_char));
+    sock = gras_socket_server_from_file(filename);
+    gras_datadesc_recv(sock, gras_datadesc_by_name("char"),
+		       gras_arch_selfid(), &r_arch_char);
     INFO3("This datafile was generated on %s (%d), I'm %s.",
 	  gras_datadesc_arch_name(r_arch_char),(int)r_arch_char,
 	  gras_datadesc_arch_name(gras_arch_selfid()));
   }
   r_arch = (int)r_arch_char;
-  
-  TRYFAIL(test_int(sock,direction));    
-  TRYFAIL(test_float(sock,direction));  
-  TRYFAIL(test_double(sock,direction));  
-  TRYFAIL(test_array(sock,direction));  
-  TRYFAIL(test_intref(sock,direction)); 
-  
-  TRYFAIL(test_string(sock,direction)); 
 
-     TRYFAIL(test_structures(sock,direction));
+  test_int(sock,direction);    
+  test_float(sock,direction);  
+  test_double(sock,direction);  
+  test_array(sock,direction);
+  test_intref(sock,direction); 
+
+  test_string(sock,direction); 
+  test_dynar_scal(sock,direction);  
+
+  test_structures(sock,direction);
 
-  TRYFAIL(test_homostruct(sock,direction));
-  TRYFAIL(test_hetestruct(sock,direction));
-  TRYFAIL(test_nestedstruct(sock,direction));
+  test_homostruct(sock,direction);
+  test_hetestruct(sock,direction);
+  test_nestedstruct(sock,direction);
 
-  TRYFAIL(declare_chained_list_type());
-  TRYFAIL(test_chain_list(sock,direction));
-  TRYFAIL(test_graph(sock,direction)); 
+  declare_chained_list_type();
+  test_chain_list(sock,direction);
+  test_graph(sock,direction); 
+  test_dynar_ref(sock,direction);  
 
-  TRYFAIL(test_pbio(sock,direction));
+  test_pbio(sock,direction);
 
-  TRYFAIL(test_clause(sock,direction));
+  test_clause(sock,direction);
 
-  if (direction != RW) 
+  if (direction != RW && direction != COPY) 
     gras_socket_close(sock);
   gras_exit();
   return 0;