#include "DataDesc/datadesc_private.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,DataDesc);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,datadesc);
const char *gras_datadesc_cat_names[9] = {
"undefined",
static gras_error_t
gras_datadesc_send_rec(gras_socket_t *sock,
- gras_dd_cbps_t *state,
+ gras_cbps_t *state,
gras_dict_t *refs,
gras_datadesc_type_t *type,
char *data);
static gras_error_t
gras_datadesc_recv_rec(gras_socket_t *sock,
- gras_dd_cbps_t *state,
+ gras_cbps_t *state,
gras_dict_t *refs,
gras_datadesc_type_t *type,
int r_arch,
char *l_data = NULL;
gras_error_t errcode;
- gras_assert1(size>0,"Cannot allocate %d bytes!", size);
+ gras_assert1(size>0,"Cannot allocate %ld bytes!", size);
if (! (l_data = malloc((size_t)size)) )
RAISE_MALLOC;
*l_ref = l_data;
DEBUG2("l_data=%p, &l_data=%p",l_data,&l_data);
- DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%d",
+ DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%ld",
r_ref, r_ref?*r_ref:NULL, r_len);
if (r_ref && !gras_dd_is_r_null( r_ref, r_len)) {
void *ptr = malloc(sizeof(void *));
for (cpt=0; cpt<gras_arch_count; cpt++) {
if (d1->size[cpt] != d2->size[cpt]) {
- DEBUG5("ddt_cmp: %s->size=%d != %s->size=%d (on %s)",
+ DEBUG5("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)",
d1->name,d1->size[cpt],d2->name,d2->size[cpt],
gras_arches[cpt].name);
return d1->size[cpt] > d2->size[cpt] ? 1 : -1;
}
if (d1->alignment[cpt] != d2->alignment[cpt]) {
- DEBUG5("ddt_cmp: %s->alignment=%d != %s->alignment=%d (on %s)",
+ DEBUG5("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)",
d1->name,d1->alignment[cpt],d2->name,d2->alignment[cpt],
gras_arches[cpt].name);
return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1;
}
if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) {
- DEBUG5("ddt_cmp: %s->aligned_size=%d != %s->aligned_size=%d (on %s)",
+ DEBUG5("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)",
d1->name,d1->aligned_size[cpt],d2->name,d2->aligned_size[cpt],
gras_arches[cpt].name);
return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1;
return d1->category_code > d2->category_code ? 1 : -1;
}
- if (d1->pre != d2->pre) {
- DEBUG4("ddt_cmp: %s->pre=%p != %s->pre=%p",
- d1->name,d1->pre, d2->name,d2->pre);
- return d1->pre > d2->pre ? 1 : -1;
+ if (d1->send != d2->send) {
+ DEBUG4("ddt_cmp: %s->send=%p != %s->send=%p",
+ d1->name,d1->send, d2->name,d2->send);
+ return d1->send > d2->send ? 1 : -1;
}
- if (d1->post != d2->post) {
- DEBUG4("ddt_cmp: %s->post=%p != %s->post=%p",
- d1->name,d1->post, d2->name,d2->post);
- return d1->post > d2->post ? 1 : -1;
+ if (d1->recv != d2->recv) {
+ DEBUG4("ddt_cmp: %s->recv=%p != %s->recv=%p",
+ d1->name,d1->recv, d2->name,d2->recv);
+ return d1->recv > d2->recv ? 1 : -1;
}
switch (d1->category_code) {
static gras_error_t
gras_datadesc_send_rec(gras_socket_t *sock,
- gras_dd_cbps_t *state,
+ gras_cbps_t *state,
gras_dict_t *refs,
gras_datadesc_type_t *type,
char *data) {
VERB2("Send a %s (%s)",
type->name, gras_datadesc_cat_names[type->category_code]);
- if (type->pre) {
- type->pre(state,type,data);
+ if (type->send) {
+ type->send(state,data);
}
switch (type->category_code) {
gras_dd_cat_struct_t struct_data;
gras_dd_cat_field_t *field;
char *field_data;
-
+
struct_data = type->category.struct_data;
+ gras_assert1(struct_data.closed,
+ "Please call gras_datadesc_declare_struct_close on %s before sending it",
+ type->name);
VERB1(">> Send all fields of the structure %s",type->name);
gras_dynar_foreach(struct_data.fields, cpt, field) {
field_data = data;
field_data += field->offset[GRAS_THISARCH];
- TRY(gras_datadesc_by_id(field->code, &sub_type));
+ errcode=gras_datadesc_by_id(field->code, &sub_type);
+ if (errcode != no_error)
+ RAISE4(errcode,
+ "Got %s while searching for the sub type %d, #%d of %s",
+ gras_error_name(errcode),field->code,cpt,type->name);
if (field->pre)
- field->pre(state,sub_type,field_data);
+ field->pre(state,field_data);
+ VERB1("Send field %s",field->name);
TRY(gras_datadesc_send_rec(sock,state,refs,sub_type, field_data));
if (field->post)
- field->post(state,sub_type,field_data);
+ field->post(state,field_data);
}
VERB1("<< Sent all fields of the structure %s", type->name);
union_data = type->category.union_data;
+ gras_assert1(union_data.closed,
+ "Please call gras_datadesc_declare_union_close on %s before sending it",
+ type->name);
/* retrieve the field number */
- field_num = union_data.selector(state, type, data);
+ field_num = union_data.selector(state, data);
gras_assert1(field_num > 0,
"union field selector of %s gave a negative value",
TRY(gras_datadesc_by_id(field->code, &sub_type));
if (field->pre)
- field->pre(state,sub_type,data);
+ field->pre(state,data);
TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, data));
if (field->post)
- field->post(state,sub_type,data);
+ field->post(state,data);
break;
}
/* Detect the referenced type and send it to peer if needed */
ref_code = ref_data.code;
if (ref_code < 0) {
- ref_code = ref_data.selector(state,type,data);
+ ref_code = ref_data.selector(state,data);
TRY(gras_dd_send_int(sock, ref_code));
}
/* determine and send the element count */
count = array_data.fixed_size;
if (count <= 0) {
- count = array_data.dynamic_size(state,type,data);
+ count = array_data.dynamic_size(state,data);
gras_assert1(count >=0,
"Invalid (negative) array size for type %s",type->name);
TRY(gras_dd_send_int(sock, count));
TRY(gras_datadesc_by_id(array_data.code, &sub_type));
elm_size = sub_type->aligned_size[GRAS_THISARCH];
if (sub_type->category_code == e_gras_datadesc_type_cat_scalar) {
- VERB1("Array of %d scalars, send it in one shoot",count);
+ VERB1("Array of %ld scalars, send it in one shot",count);
TRY(gras_trp_chunk_send(sock, data,
sub_type->aligned_size[GRAS_THISARCH] * count));
} else {
gras_assert0(0, "Invalid type");
}
- if (type->post) {
- type->post(state,type,data);
- }
-
return no_error;
}
void *src) {
gras_error_t errcode;
- gras_dd_cbps_t *state = NULL;
+ gras_cbps_t *state = NULL;
gras_dict_t *refs; /* all references already sent */
TRY(gras_dict_new(&refs));
- TRY(gras_dd_cbps_new(&state));
+ TRY(gras_cbps_new(&state));
errcode = gras_datadesc_send_rec(sock,state,refs,type,(char*)src);
gras_dict_free(&refs);
- gras_dd_cbps_free(&state);
+ gras_cbps_free(&state);
return errcode;
}
*/
gras_error_t
gras_datadesc_recv_rec(gras_socket_t *sock,
- gras_dd_cbps_t *state,
+ gras_cbps_t *state,
gras_dict_t *refs,
gras_datadesc_type_t *type,
int r_arch,
switch (type->category_code) {
case e_gras_datadesc_type_cat_scalar:
- if (type->size[GRAS_THISARCH] >= type->size[r_arch]) {
+ if (type->size[GRAS_THISARCH] == type->size[r_arch]) {
TRY(gras_trp_chunk_recv(sock, (char*)l_data, type->size[r_arch]));
TRY(gras_dd_convert_elm(type,1,r_arch, l_data,l_data));
} else {
struct_data = type->category.struct_data;
+ gras_assert1(struct_data.closed,
+ "Please call gras_datadesc_declare_struct_close on %s before receiving it",
+ type->name);
VERB1(">> Receive all fields of the structure %s",type->name);
gras_dynar_foreach(struct_data.fields, cpt, field) {
char *field_data = l_data + field->offset[GRAS_THISARCH];
union_data = type->category.union_data;
+ gras_assert1(union_data.closed,
+ "Please call gras_datadesc_declare_union_close on %s before receiving it",
+ type->name);
/* retrieve the field number */
TRY(gras_dd_recv_int(sock, r_arch, &field_num));
if (field_num < 0)
gras_assert0(0, "Invalid type");
}
+ if (type->recv)
+ type->recv(state,l_data);
+
return no_error;
}
void *dst) {
gras_error_t errcode;
- gras_dd_cbps_t *state = NULL; /* callback persistent state */
+ gras_cbps_t *state = NULL; /* callback persistent state */
gras_dict_t *refs; /* all references already sent */
TRY(gras_dict_new(&refs));
- TRY(gras_dd_cbps_new(&state));
+ TRY(gras_cbps_new(&state));
errcode = gras_datadesc_recv_rec(sock, state, refs, type,
r_arch, NULL, 0,
(char *) dst,-1);
gras_dict_free(&refs);
- gras_dd_cbps_free(&state);
+ gras_cbps_free(&state);
return errcode;
}
