X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc01c6a871dbbfd0cc84e26eb9f94aeb539e613e..53cde8dfb94134348e908b3c2845200ffc582dc7:/teshsuite/gras/datadesc/datadesc_usage.c?ds=sidebyside diff --git a/teshsuite/gras/datadesc/datadesc_usage.c b/teshsuite/gras/datadesc/datadesc_usage.c index 8caa457b6d..2460d7fe56 100644 --- a/teshsuite/gras/datadesc/datadesc_usage.c +++ b/teshsuite/gras/datadesc/datadesc_usage.c @@ -11,9 +11,9 @@ #endif #include +#include "xbt/datadesc.h" +#include "xbt/datadesc/datadesc_interface.h" #include "gras.h" - -#include "gras/DataDesc/datadesc_interface.h" XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this test"); #define READ 0 @@ -24,11 +24,11 @@ const char *filename = "datadesc_usage.out"; void write_read(const char *msgtype, void *src, void *dst, - gras_socket_t sock, int direction); + xbt_socket_t sock, int direction); void write_read(const char *msgtype, void *src, void *dst, - gras_socket_t sock, int direction) + xbt_socket_t sock, int direction) { switch (direction) { @@ -41,7 +41,7 @@ write_read(const char *msgtype, void *src, void *dst, break; case COPY: - gras_datadesc_memcpy(gras_datadesc_by_name(msgtype), src, dst); + xbt_datadesc_memcpy(xbt_datadesc_by_name(msgtype), src, dst); break; } } @@ -49,57 +49,57 @@ write_read(const char *msgtype, void *src, void *dst, /* defined in datadesc_structures.c, which in perl generated */ void register_structures(void); -void test_structures(gras_socket_t sock, int direction); +void test_structures(xbt_socket_t sock, int direction); /************************ * Each and every tests * ************************/ -static void test_int(gras_socket_t sock, int direction) +static void test_int(xbt_socket_t sock, int direction) { int i = 5, j; - INFO0("---- Test on integer ----"); + XBT_INFO("---- Test on integer ----"); write_read("int", &i, &j, sock, direction); if (direction == READ || direction == COPY) xbt_assert(i == j); } -static void test_float(gras_socket_t sock, int direction) +static void test_float(xbt_socket_t sock, int direction) { float i = 5.0, j; - INFO0("---- Test on float ----"); + XBT_INFO("---- Test on float ----"); write_read("float", &i, &j, sock, direction); if (direction == READ || direction == COPY) - xbt_assert2(i == j, "%f != %f", i, j); + xbt_assert(i == j, "%f != %f", i, j); } -static void test_double(gras_socket_t sock, int direction) +static void test_double(xbt_socket_t sock, int direction) { double i = -3252355.1234, j; - INFO0("---- Test on double ----"); + XBT_INFO("---- Test on double ----"); write_read("double", &i, &j, sock, direction); if (direction == READ || direction == COPY) - xbt_assert2(i == j, "%f != %f", i, j); + xbt_assert(i == j, "%f != %f", i, j); } #define FIXED_ARRAY_SIZE 5 typedef int array[FIXED_ARRAY_SIZE]; -static void test_array(gras_socket_t sock, int direction) +static void test_array(xbt_socket_t sock, int direction) { array i = { 35212, -6226, 74337, 11414, 7733 }; array j; int cpt; - INFO0("---- Test on fixed array ----"); + XBT_INFO("---- Test on fixed array ----"); write_read("fixed int array", &i, &j, sock, direction); if (direction == READ || direction == COPY) { for (cpt = 0; cpt < FIXED_ARRAY_SIZE; cpt++) { - DEBUG1("Test spot %d", cpt); - xbt_assert4(i[cpt] == j[cpt], "i[%d]=%d != j[%d]=%d", + XBT_DEBUG("Test spot %d", cpt); + xbt_assert(i[cpt] == j[cpt], "i[%d]=%d != j[%d]=%d", cpt, i[cpt], cpt, j[cpt]); } } @@ -107,16 +107,16 @@ static void test_array(gras_socket_t sock, int direction) /*** Dynar of scalar ***/ -static void test_dynar_scal(gras_socket_t sock, int direction) +static void test_dynar_scal(xbt_socket_t sock, int direction) { xbt_dynar_t i, j; int cpt; - INFO0("---- Test on dynar containing integers ----"); + XBT_INFO("---- Test on dynar containing integers ----"); 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_DEBUG("Push %d, length=%lu", cpt, xbt_dynar_length(i)); } /* xbt_dynar_dump(i); */ write_read("xbt_dynar_of_int", &i, &j, sock, direction); @@ -125,7 +125,7 @@ static void test_dynar_scal(gras_socket_t sock, int direction) for (cpt = 0; cpt < 64; cpt++) { int ret = xbt_dynar_get_as(j, cpt, int); if (cpt != ret) { - CRITICAL3 + XBT_CRITICAL ("The retrieved value for cpt=%d is not the same than the injected one (%d!=%d)", cpt, ret, cpt); xbt_abort(); @@ -138,33 +138,33 @@ static void test_dynar_scal(gras_socket_t sock, int direction) /*** Empty dynar ***/ -static void test_dynar_empty(gras_socket_t sock, int direction) +static void test_dynar_empty(xbt_socket_t sock, int direction) { xbt_dynar_t i, j; - INFO0("---- Test on empty dynar of integers ----"); + XBT_INFO("---- Test on empty dynar of integers ----"); i = xbt_dynar_new(sizeof(int), NULL); write_read("xbt_dynar_of_int", &i, &j, sock, direction); /* xbt_dynar_dump(j); */ if (direction == READ || direction == COPY) { - xbt_assert(xbt_dynar_length(j) == 0); + xbt_assert(xbt_dynar_is_empty(j)); xbt_dynar_free(&j); } xbt_dynar_free(&i); } -static void test_intref(gras_socket_t sock, int direction) +static void test_intref(xbt_socket_t sock, int direction) { int *i, *j; i = xbt_new(int, 1); *i = 12345; - INFO0("---- Test on a reference to an integer ----"); + XBT_INFO("---- Test on a reference to an integer ----"); write_read("int*", &i, &j, sock, direction); if (direction == READ || direction == COPY) { - xbt_assert2(*i == *j, "*i != *j (%d != %d)", *i, *j); + xbt_assert(*i == *j, "*i != *j (%d != %d)", *i, *j); free(j); } free(i); @@ -173,16 +173,16 @@ static void test_intref(gras_socket_t sock, int direction) /*** *** string (dynamic array) ***/ -static void test_string(gras_socket_t sock, int direction) +static void test_string(xbt_socket_t sock, int direction) { char *i = xbt_strdup("Some data"), *j = NULL; int cpt; - INFO0("---- Test on string (ref to dynamic array) ----"); + XBT_INFO("---- Test on string (ref to dynamic array) ----"); write_read("string", &i, &j, sock, direction); if (direction == READ || direction == COPY) { for (cpt = 0; cpt < strlen(i); cpt++) { - xbt_assert4(i[cpt] == j[cpt], "i[%d]=%c != j[%d]=%c", + xbt_assert(i[cpt] == j[cpt], "i[%d]=%c != j[%d]=%c", cpt, i[cpt], cpt, j[cpt]); } free(j); @@ -197,11 +197,11 @@ static void test_string(gras_socket_t sock, int direction) typedef struct { int a, b, c, d; } homostruct; -static void test_homostruct(gras_socket_t sock, int direction) +static void test_homostruct(xbt_socket_t sock, int direction) { homostruct *i, *j; - INFO0("---- Test on homogeneous structure ----"); + XBT_INFO("---- Test on homogeneous structure ----"); /* init a value, exchange it and check its validity */ i = xbt_new(homostruct, 1); i->a = 2235; @@ -211,7 +211,7 @@ static void test_homostruct(gras_socket_t sock, int direction) write_read("homostruct*", &i, &j, sock, direction); if (direction == READ || direction == COPY) { - xbt_assert2(i->a == j->a, "i->a=%d != j->a=%d", i->a, j->a); + xbt_assert(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); @@ -229,11 +229,11 @@ typedef struct { unsigned char c2; unsigned long int l2; } hetestruct; -static void test_hetestruct(gras_socket_t sock, int direction) +static void test_hetestruct(xbt_socket_t sock, int direction) { hetestruct *i, *j; - INFO0("---- Test on heterogeneous structure ----"); + XBT_INFO("---- Test on heterogeneous structure ----"); /* init a value, exchange it and check its validity */ i = xbt_new(hetestruct, 1); i->c1 = 's'; @@ -245,7 +245,7 @@ static void test_hetestruct(gras_socket_t sock, int direction) if (direction == READ || 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, + xbt_assert(i->l1 == j->l1, "i->l1(=%lu) != j->l1(=%lu)", i->l1, j->l1); xbt_assert(i->l2 == j->l2); free(j); @@ -253,12 +253,12 @@ static void test_hetestruct(gras_socket_t sock, int direction) free(i); } -static void test_hetestruct_array(gras_socket_t sock, int direction) +static void test_hetestruct_array(xbt_socket_t sock, int direction) { hetestruct *i, *j, *p, *q; int cpt; - INFO0("---- Test on heterogeneous structure arrays ----"); + XBT_INFO("---- Test on heterogeneous structure arrays ----"); /* init a value, exchange it and check its validity */ i = xbt_malloc(sizeof(hetestruct) * 10); for (cpt = 0, p = i; cpt < 10; cpt++, p++) { @@ -273,8 +273,8 @@ static void test_hetestruct_array(gras_socket_t sock, int direction) for (cpt = 0, p = i, q = j; cpt < 10; cpt++, p++, q++) { xbt_assert(p->c1 == q->c1); xbt_assert(p->c2 == q->c2); - xbt_assert3(p->l1 == p->l1, - "for cpt=%d i->l1(=%ld) != j->l1(=%ld)", cpt, p->l1, + xbt_assert(p->l1 == p->l1, + "for cpt=%d i->l1(=%lu) != j->l1(=%lu)", cpt, p->l1, q->l1); xbt_assert(q->l2 == p->l2); } @@ -290,11 +290,11 @@ typedef struct { hetestruct hete; homostruct homo; } nestedstruct; -static void test_nestedstruct(gras_socket_t sock, int direction) +static void test_nestedstruct(xbt_socket_t sock, int direction) { nestedstruct *i, *j; - INFO0("---- Test on nested structures ----"); + XBT_INFO("---- Test on nested structures ----"); /* init a value, exchange it and check its validity */ i = xbt_new(nestedstruct, 1); i->homo.a = 235231; @@ -360,11 +360,11 @@ int list_eq(chained_list_t * i, chained_list_t * j) return list_eq(i->l, j->l); } -static void test_chain_list(gras_socket_t sock, int direction) +static void test_chain_list(xbt_socket_t sock, int direction) { chained_list_t *i, *j; - INFO0("---- Test on chained list ----"); + XBT_INFO("---- Test on chained list ----"); /* init a value, exchange it and check its validity */ i = cons(12355, cons(246264, cons(23263, NULL))); @@ -382,11 +382,11 @@ static void test_chain_list(gras_socket_t sock, int direction) /*** *** graph ***/ -static void test_graph(gras_socket_t sock, int direction) +static void test_graph(xbt_socket_t sock, int direction) { chained_list_t *i, *j; - INFO0("---- Test on graph (cyclique chained list of 3 items) ----"); + XBT_INFO("---- 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; @@ -395,15 +395,15 @@ static void test_graph(gras_socket_t sock, int direction) write_read("chained_list_t*", &i, &j, sock, direction); if (direction == READ || direction == COPY) { - DEBUG1("i=%p", i); - DEBUG1("i->l=%p", i->l); - DEBUG1("i->l->l=%p", i->l->l); - DEBUG1("i->l->l->l=%p", i->l->l->l); - DEBUG1("j=%p", j); - DEBUG1("j->l=%p", j->l); - DEBUG1("j->l->l=%p", j->l->l); - DEBUG1("j->l->l->l=%p", j->l->l->l); - xbt_assert4(j->l->l->l == j, + XBT_DEBUG("i=%p", i); + XBT_DEBUG("i->l=%p", i->l); + XBT_DEBUG("i->l->l=%p", i->l->l); + XBT_DEBUG("i->l->l->l=%p", i->l->l->l); + XBT_DEBUG("j=%p", j); + XBT_DEBUG("j->l=%p", j->l); + XBT_DEBUG("j->l->l=%p", j->l->l); + XBT_DEBUG("j->l->l->l=%p", j->l->l->l); + xbt_assert(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; @@ -423,14 +423,14 @@ static void free_string(void *d) free(*(void **) d); } -static void test_dynar_ref(gras_socket_t sock, int direction) +static void test_dynar_ref(xbt_socket_t sock, int direction) { xbt_dynar_t i, j; char buf[1024]; char *s1, *s2; int cpt; - INFO0("---- Test on dynar containing integers ----"); + XBT_INFO("---- Test on dynar containing integers ----"); i = xbt_dynar_new(sizeof(char *), &free_string); for (cpt = 0; cpt < 64; cpt++) { @@ -444,7 +444,7 @@ static void test_dynar_ref(gras_socket_t sock, int direction) for (cpt = 0; cpt < 64; cpt++) { sprintf(buf, "%d", cpt); xbt_dynar_shift(j, &s2); - xbt_assert2(!strcmp(buf, s2), + xbt_assert(!strcmp(buf, s2), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s2); free(s2); @@ -456,31 +456,30 @@ static void test_dynar_ref(gras_socket_t sock, int direction) /**** PBIO *****/ -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]; - int Cnshr; - int Cnpt; double Cdtime; double Ctime[2]; int Cntens; - double Cdfgrd0[373][3]; - double Cdfgrd1[3][3]; double Cstress[106]; - double Cddsdde[106][106]; - }; +XBT_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]; + int Cnshr; + int Cnpt; double Cdtime; double Ctime[2]; int Cntens; + double Cdfgrd0[373][3]; + double Cdfgrd1[3][3]; double Cstress[106]; + double Cddsdde[106][106]; + }; ) typedef struct s_pbio pbio_t; -static void test_pbio(gras_socket_t sock, int direction) +static void test_pbio(xbt_socket_t sock, int direction) { int cpt; int cpt2; - gras_datadesc_type_t pbio_type; pbio_t i, j; - INFO0 + XBT_INFO ("---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----"); - pbio_type = gras_datadesc_by_symbol(s_pbio); + xbt_datadesc_by_symbol(s_pbio); /* Fill in that damn struct */ i.Cnstatv = 325115; @@ -514,7 +513,7 @@ static void test_pbio(gras_socket_t sock, int direction) /* Check that the data match */ xbt_assert(i.Cnstatv == j.Cnstatv); for (cpt = 0; cpt < 12; cpt++) - xbt_assert4(i.Cstatev[cpt] == j.Cstatev[cpt], + xbt_assert(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); @@ -537,26 +536,26 @@ static void test_pbio(gras_socket_t sock, int direction) for (cpt = 0; cpt < 106; cpt++) { xbt_assert(i.Cstress[cpt] == j.Cstress[cpt]); for (cpt2 = 0; cpt2 < 106; cpt2++) - xbt_assert4(i.Cddsdde[cpt][cpt2] == j.Cddsdde[cpt][cpt2], + xbt_assert(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]); } } } -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 */ - };) +XBT_DEFINE_TYPE(s_clause, struct s_clause { + int num_lits; + int *literals XBT_ANNOTE(size, num_lits); /* Tells GRAS where to find the size */ + };) typedef struct s_clause Clause; -static void test_clause(gras_socket_t sock, int direction) +static void test_clause(xbt_socket_t sock, int direction) { Clause *i, *j; int cpt; - INFO0 + XBT_INFO ("---- Test on struct containing dynamic array and its size (cbps test) ----"); /* create and fill the struct */ @@ -566,8 +565,8 @@ static void test_clause(gras_socket_t sock, int direction) 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); + XBT_DEBUG("created data=%p (within %p @%p)", &(i->num_lits), i, &i); + XBT_DEBUG("created count=%d", i->num_lits); write_read("Clause*", &i, &j, sock, direction); if (direction == READ || direction == COPY) { @@ -582,11 +581,11 @@ static void test_clause(gras_socket_t sock, int direction) free(i); } -static void test_clause_empty(gras_socket_t sock, int direction) +static void test_clause_empty(xbt_socket_t sock, int direction) { Clause *i, *j; - INFO0 + XBT_INFO ("---- Test on struct containing dynamic array and its size when size=0 (cbps test) ----"); /* create and fill the struct */ @@ -594,8 +593,8 @@ static void test_clause_empty(gras_socket_t sock, int direction) i->num_lits = 0; i->literals = NULL; - DEBUG3("created data=%p (within %p @%p)", &(i->num_lits), i, &i); - DEBUG1("created count=%d", i->num_lits); + XBT_DEBUG("created data=%p (within %p @%p)", &(i->num_lits), i, &i); + XBT_DEBUG("created count=%d", i->num_lits); write_read("Clause*", &i, &j, sock, direction); if (direction == READ || direction == COPY) { @@ -610,88 +609,88 @@ static void test_clause_empty(gras_socket_t sock, int direction) static void register_types(void) { - gras_datadesc_type_t my_type, ref_my_type; + xbt_datadesc_type_t my_type, ref_my_type; - gras_msgtype_declare("char", gras_datadesc_by_name("char")); - gras_msgtype_declare("int", gras_datadesc_by_name("int")); - gras_msgtype_declare("float", gras_datadesc_by_name("float")); - gras_msgtype_declare("double", gras_datadesc_by_name("double")); + gras_msgtype_declare("char", xbt_datadesc_by_name("char")); + gras_msgtype_declare("int", xbt_datadesc_by_name("int")); + gras_msgtype_declare("float", xbt_datadesc_by_name("float")); + gras_msgtype_declare("double", xbt_datadesc_by_name("double")); - my_type = gras_datadesc_array_fixed("fixed int array", - gras_datadesc_by_name("int"), + my_type = xbt_datadesc_array_fixed("fixed int array", + xbt_datadesc_by_name("int"), FIXED_ARRAY_SIZE); gras_msgtype_declare("fixed int array", my_type); - my_type = gras_datadesc_dynar(gras_datadesc_by_name("int"), NULL); + my_type = xbt_datadesc_dynar(xbt_datadesc_by_name("int"), NULL); gras_msgtype_declare("xbt_dynar_of_int", my_type); - my_type = gras_datadesc_ref("int*", gras_datadesc_by_name("int")); + my_type = xbt_datadesc_ref("int*", xbt_datadesc_by_name("int")); gras_msgtype_declare("int*", my_type); - gras_msgtype_declare("string", gras_datadesc_by_name("string")); + gras_msgtype_declare("string", xbt_datadesc_by_name("string")); - 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 = xbt_datadesc_struct("homostruct"); + xbt_datadesc_struct_append(my_type, "a", + xbt_datadesc_by_name("signed int")); + xbt_datadesc_struct_append(my_type, "b", xbt_datadesc_by_name("int")); + xbt_datadesc_struct_append(my_type, "c", xbt_datadesc_by_name("int")); + xbt_datadesc_struct_append(my_type, "d", xbt_datadesc_by_name("int")); + xbt_datadesc_struct_close(my_type); my_type = - gras_datadesc_ref("homostruct*", - gras_datadesc_by_name("homostruct")); + xbt_datadesc_ref("homostruct*", + xbt_datadesc_by_name("homostruct")); gras_msgtype_declare("homostruct*", 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 = xbt_datadesc_struct("hetestruct"); + xbt_datadesc_struct_append(my_type, "c1", + xbt_datadesc_by_name("unsigned char")); + xbt_datadesc_struct_append(my_type, "l1", + xbt_datadesc_by_name("unsigned long int")); + xbt_datadesc_struct_append(my_type, "c2", + xbt_datadesc_by_name("unsigned char")); + xbt_datadesc_struct_append(my_type, "l2", + xbt_datadesc_by_name("unsigned long int")); + xbt_datadesc_struct_close(my_type); my_type = - gras_datadesc_ref("hetestruct*", - gras_datadesc_by_name("hetestruct")); + xbt_datadesc_ref("hetestruct*", + xbt_datadesc_by_name("hetestruct")); gras_msgtype_declare("hetestruct*", my_type); my_type = - gras_datadesc_array_fixed("hetestruct[10]", - gras_datadesc_by_name("hetestruct"), 10); - my_type = gras_datadesc_ref("hetestruct[10]*", my_type); + xbt_datadesc_array_fixed("hetestruct[10]", + xbt_datadesc_by_name("hetestruct"), 10); + my_type = xbt_datadesc_ref("hetestruct[10]*", my_type); gras_msgtype_declare("hetestruct[10]*", my_type); - my_type = gras_datadesc_struct("nestedstruct"); - 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 = xbt_datadesc_struct("nestedstruct"); + xbt_datadesc_struct_append(my_type, "hete", + xbt_datadesc_by_name("hetestruct")); + xbt_datadesc_struct_append(my_type, "homo", + xbt_datadesc_by_name("homostruct")); + xbt_datadesc_struct_close(my_type); my_type = - gras_datadesc_ref("nestedstruct*", - gras_datadesc_by_name("nestedstruct")); + xbt_datadesc_ref("nestedstruct*", + xbt_datadesc_by_name("nestedstruct")); gras_msgtype_declare("nestedstruct*", my_type); - my_type = gras_datadesc_struct("chained_list_t"); - ref_my_type = gras_datadesc_ref("chained_list_t*", 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); - gras_datadesc_cycle_set(gras_datadesc_by_name("chained_list_t*")); + my_type = xbt_datadesc_struct("chained_list_t"); + ref_my_type = xbt_datadesc_ref("chained_list_t*", my_type); + xbt_datadesc_struct_append(my_type, "v", xbt_datadesc_by_name("int")); + xbt_datadesc_struct_append(my_type, "l", ref_my_type); + xbt_datadesc_struct_close(my_type); + xbt_datadesc_cycle_set(xbt_datadesc_by_name("chained_list_t*")); gras_msgtype_declare("chained_list_t", my_type); gras_msgtype_declare("chained_list_t*", ref_my_type); my_type = - gras_datadesc_dynar(gras_datadesc_by_name("string"), &free_string); + xbt_datadesc_dynar(xbt_datadesc_by_name("string"), &free_string); gras_msgtype_declare("xbt_dynar_of_string", my_type); - my_type = gras_datadesc_by_symbol(s_pbio); + my_type = xbt_datadesc_by_symbol(s_pbio); gras_msgtype_declare("s_pbio", my_type); - my_type = gras_datadesc_by_symbol(s_clause); - my_type = gras_datadesc_ref("Clause*", my_type); + my_type = xbt_datadesc_by_symbol(s_clause); + my_type = xbt_datadesc_ref("Clause*", my_type); gras_msgtype_declare("Clause*", my_type); } @@ -702,7 +701,7 @@ static void register_types(void) int main(int argc, char *argv[]) { - gras_socket_t sock = NULL; + xbt_socket_t sock = NULL; int direction = WRITE; int cpt; char local_arch, remote_arch; @@ -713,9 +712,9 @@ int main(int argc, char *argv[]) for (cpt = 1; cpt < argc; cpt++) { if (!strcmp(argv[cpt], "--arch")) { - INFO2("We are on %s (#%d)", - gras_datadesc_arch_name(gras_arch_selfid()), - (int) gras_arch_selfid()); + XBT_INFO("We are on %s (#%d)", + xbt_datadesc_arch_name(xbt_arch_selfid()), + (int) xbt_arch_selfid()); exit(0); } else if (!strcmp(argv[cpt], "--help")) { printf("Usage: datadesc_usage [option] [filename]\n"); @@ -731,7 +730,7 @@ int main(int argc, char *argv[]) direction = WRITE; filename = bprintf("datadesc.%s", - gras_datadesc_arch_name(gras_arch_selfid())); + xbt_datadesc_arch_name(xbt_arch_selfid())); } else if (!strcmp(argv[cpt], "--read")) { direction = READ; } else if (!strcmp(argv[cpt], "--write")) { @@ -744,24 +743,24 @@ int main(int argc, char *argv[]) } if (direction == WRITE) { - INFO1("Write to file %s", + XBT_INFO("Write to file %s", strrchr(filename, '/') ? strrchr(filename, '/') + 1 : filename); sock = gras_socket_client_from_file(filename); } if (direction == READ) { - INFO1("Read from file %s", + XBT_INFO("Read from file %s", strrchr(filename, '/') ? strrchr(filename, '/') + 1 : filename); sock = gras_socket_server_from_file(filename); } if (direction == COPY) { - INFO0("Memory copy"); + XBT_INFO("Memory copy"); } - local_arch = gras_arch_selfid(); + local_arch = xbt_arch_selfid(); write_read("char", &local_arch, &remote_arch, sock, direction); if (direction == READ) - VERB2("This file was generated on %s (%d)", - gras_datadesc_arch_name(remote_arch), (int) remote_arch); + XBT_VERB("This file was generated on %s (%d)", + xbt_datadesc_arch_name(remote_arch), (int) remote_arch); test_int(sock, direction);