/* 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
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);
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_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_int(gras_socket_t *sock, int direction) {
- gras_error_t errcode;
+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 */
+xbt_error_t test_structures(gras_socket_t sock, int direction);
+
+
+
+xbt_error_t test_int(gras_socket_t sock, int direction) {
+ xbt_error_t errcode;
int i=5,j;
- INFO0("==== Test on integer ====");
+ 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 ====");
+ INFO0("---- Test on float ----");
TRY(write_read(gras_datadesc_by_name("float"), &i,&j, sock,direction));
if (direction == READ || direction == RW) {
- gras_assert(i == j);
+ xbt_assert2(i == j,"%f != %f",i,j);
+ }
+ return no_error;
+}
+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) {
+ 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,j;
+ array i = { 35212,-6226,74337,11414,7733};
+ array j;
int cpt;
- INFO0("==== Test on fixed array ====");
- for (cpt=0; cpt<SIZE; cpt++) {
- i[cpt] = rand();
- }
+ 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);
+ 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);
/***
*** 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) ====");
+ 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) {
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);
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 ====");
+ 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")));
- 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->a = rand(); i->b = rand();
- i->c = rand(); i->d = rand();
+ 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);
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 ====");
+ 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")));
- 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_assert(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);
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 ====");
+ 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")));
- 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->homo.a = rand(); i->homo.b = rand();
- i->homo.c = rand(); i->homo.d = rand();
+ 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);
+ 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);
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_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;
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 ====");
+ INFO0("---- Test on chained list ----");
/* init a value, exchange it and check its validity*/
- i = cons( rand(), cons( rand() , cons( rand(), NULL)));
+ 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));
+ xbt_assert(list_eq(i,j));
list_free(j);
}
/***
*** 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) ====");
+ INFO0("---- Test on graph (cyclique chained list) ----");
/* init a value, exchange it and check its validity*/
- i = cons( rand(), cons( rand() , cons( rand(), NULL)));
+ 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) {
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 READ mode */
+ i->l->l->l = NULL; /* do this even in WRITE mode */
list_free(i);
return no_error;
}
/**** PBIO *****/
-typedef struct { /* structure presented in the IEEE article */
+GRAS_DEFINE_TYPE(s_pbio,
+struct s_pbio{ /* structure presented in the IEEE article */
int Cnstatv;
double Cstatev[12];
int Cnprops;
double Cprops[110];
- int Cndi[4], Cnshr, Cnpt;
- double Cdtime, Ctime[2];
+ int Cndi[4];
+ int Cnshr;
+ int Cnpt;
+ double Cdtime;
+ double Ctime[2];
int Cntens;
- double Cdfgrd0[3][373], Cdfgrd1[3][3], Cstress[106], Cddsdde[106][106];
-} KSdata1;
+ double Cdfgrd0[373][3];
+ double Cdfgrd1[3][3];
+ double Cstress[106];
+ double Cddsdde[106][106];
+};
+ )
+typedef struct s_pbio pbio_t;
+pbio_t pbio_i, pbio_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;
+
+ 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 */
+ pbio_i.Cnstatv = 325115;
+ for (cpt=0; cpt<12; cpt++)
+ pbio_i.Cstatev[cpt] = ((double) cpt) * -2361.11;
+ pbio_i.Cnprops = -37373;
+ for (cpt=0; cpt<110; cpt++)
+ pbio_i.Cprops[cpt] = cpt * 100.0;
+ for (cpt=0; cpt<4; cpt++)
+ 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++)
+ pbio_i.Cdfgrd0[cpt2][cpt] = ((double)cpt) * ((double)cpt2);
+ for (cpt2=0; cpt2<3; cpt2++)
+ pbio_i.Cdfgrd1[cpt][cpt2] = -((double)cpt) * ((double)cpt2);
+ }
+ for (cpt=0; cpt<106; cpt++) {
+ pbio_i.Cstress[cpt]=(double)cpt * 22.113;
+ for (cpt2=0; cpt2<106; cpt2++)
+ pbio_i.Cddsdde[cpt][cpt2] = ((double)cpt) * ((double)cpt2);
+ }
+ TRY(write_read(gras_datadesc_by_symbol(s_pbio),
+ &pbio_i,&pbio_j, sock,direction));
+ if (direction == READ || direction == RW) {
+ /* Check that the data match */
+ xbt_assert(pbio_i.Cnstatv == pbio_j.Cnstatv);
+ for (cpt=0; cpt<12; cpt++)
+ 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++)
+ xbt_assert(pbio_i.Cprops[cpt] == pbio_j.Cprops[cpt]);
+ for (cpt=0; cpt<4; cpt++)
+ 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++)
+ xbt_assert(pbio_i.Cdfgrd0[cpt2][cpt] == pbio_j.Cdfgrd0[cpt2][cpt]);
+ for (cpt2=0; cpt2<3; cpt2++)
+ xbt_assert(pbio_i.Cdfgrd1[cpt][cpt2] == pbio_j.Cdfgrd1[cpt][cpt2]);
+ }
+ for (cpt=0; cpt<106; cpt++) {
+ xbt_assert(pbio_i.Cstress[cpt] == pbio_j.Cstress[cpt]);
+ for (cpt2=0; cpt2<106; cpt2++)
+ xbt_assert4(pbio_i.Cddsdde[cpt][cpt2] == pbio_j.Cddsdde[cpt][cpt2],
+ "%f=i.Cddsdde[%d][%d] != j.Cddsdde[cpt][cpt2]=%f",
+ pbio_i.Cddsdde[cpt][cpt2],cpt,cpt2,pbio_j.Cddsdde[cpt][cpt2]);
+ }
+ }
+
+ return no_error;
+}
+
+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;
+
+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 */
+ i=xbt_new(Clause,1);
+
+ i->num_lits = 5432;
+ 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 */
+ 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) {
+ xbt_assert(i->num_lits == j->num_lits);
+ for (cpt=0; cpt<i->num_lits; 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;
+ 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")) {
TRYFAIL(gras_socket_server_from_file(filename,&sock));
TRY(gras_datadesc_recv(sock, gras_datadesc_by_name("char"),
gras_arch_selfid(), &r_arch_char));
- INFO2("This datafile was generated on %s (%d)",
- gras_datadesc_arch_name(r_arch_char),(int)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));
+
TRYFAIL(test_homostruct(sock,direction));
TRYFAIL(test_hetestruct(sock,direction));
TRYFAIL(test_nestedstruct(sock,direction));
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));
+
+ TRYFAIL(test_clause(sock,direction));
if (direction != RW)
gras_socket_close(sock);
