X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2577d0360f31128b87c748dc9a3253b2ed87727..60f31f9d24bd348ccad2ea99ba96424360b11a92:/src/gras/DataDesc/ddt_exchange.c diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index f9304d6dde..fb5b7b4bdd 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -9,44 +9,53 @@ under the terms of the license (GNU LGPL) which comes with this package. */ #include "DataDesc/datadesc_private.h" +#include "Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,DataDesc); +GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,datadesc); -static const char *gras_datadesc_cat_names[9] = { +#undef DETECT_CYCLE +/* CRUDE HACK to turn all cycle detection of */ +#ifndef DETECT_CYCLE +#define gras_dict_get_ext(a,b,c,d) mismatch_error +#define gras_dict_set_ext(a,b,c,d,e) no_error +#endif + +const char *gras_datadesc_cat_names[9] = { "undefined", "scalar", "struct", "union", "ref", "array", "ignored", "invalid"}; static gras_datadesc_type_t *int_type = NULL; static gras_datadesc_type_t *pointer_type = NULL; -static gras_error_t gras_dd_send_int(gras_socket_t *sock, int i); -static gras_error_t gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i); +static inline gras_error_t gras_dd_send_int(gras_socket_t *sock, int i); +static inline gras_error_t gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i); -static gras_error_t +static inline gras_error_t gras_dd_alloc_ref(gras_dict_t *refs, long int size, char **r_ref, long int r_len, char **l_ref); -static int +static inline int gras_dd_is_r_null(char **r_ptr, long int length); 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 **r_data, long int r_lgr, - char **dst); + char *dst, + int subsize); -static gras_error_t +static inline gras_error_t gras_dd_send_int(gras_socket_t *sock,int i) { if (!int_type) { @@ -58,7 +67,7 @@ gras_dd_send_int(gras_socket_t *sock,int i) { return gras_trp_chunk_send(sock, (char*)&i, int_type->size[GRAS_THISARCH]); } -static gras_error_t +static inline gras_error_t gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i) { gras_error_t errcode; @@ -69,12 +78,14 @@ gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i) { if (int_type->size[GRAS_THISARCH] >= int_type->size[r_arch]) { TRY(gras_trp_chunk_recv(sock, (char*)i, int_type->size[r_arch])); - TRY(gras_dd_convert_elm(int_type,r_arch, i,i)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(int_type,1,r_arch, i,i)); } else { void *ptr = NULL; ptr = malloc((size_t)int_type->size[r_arch]); TRY(gras_trp_chunk_recv(sock, (char*)ptr, int_type->size[r_arch])); - TRY(gras_dd_convert_elm(int_type,r_arch, ptr,i)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(int_type,1,r_arch, ptr,i)); free(ptr); } DEBUG1("recv_int(%d)",*i); @@ -87,7 +98,7 @@ gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i) { * of 'length' bytes set to 0. * FIXME: Check in configure? */ -static int +static inline int gras_dd_is_r_null(char **r_ptr, long int length) { int i; @@ -100,35 +111,37 @@ gras_dd_is_r_null(char **r_ptr, long int length) { return 1; } -static gras_error_t +static inline gras_error_t gras_dd_alloc_ref(gras_dict_t *refs, long int size, char **r_ref, long int r_len, /* pointer_type->size[r_arch] */ char **l_ref) { 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); +#ifdef DETECT_CYCLE if (r_ref && !gras_dd_is_r_null( r_ref, r_len)) { + gras_error_t errcode; void *ptr = malloc(sizeof(void *)); if (!ptr) RAISE_MALLOC; - // memcpy(ptr,&l_data, sizeof(void *)); + memcpy(ptr,l_ref, sizeof(void *)); DEBUG2("Insert %p under %p",*(void**)ptr, *(void**)r_ref); - /* FIXME: Leaking on the ptr. Do I really need to copy it? */ - TRY(gras_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, NULL)); + + TRY(gras_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free)); } +#endif return no_error; } @@ -146,25 +159,62 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, gras_dd_cat_field_t *field1,*field2; gras_datadesc_type_t *field_desc_1,*field_desc_2; + if (d1 == d2) return 0; /* easy optimization */ - if (!d1 && d2) return 1; - if (!d1 && !d2) return 0; - if ( d1 && !d2) return -1; + if (!d1 && d2) { + DEBUG0("ddt_cmp: !d1 && d2 => 1"); + return 1; + } + if (!d1 && !d2) { + DEBUG0("ddt_cmp: !d1 && !d2 => 0"); + return 0; + } + if ( d1 && !d2) { + DEBUG0("ddt_cmp: d1 && !d2 => -1"); + return -1; + } - if (d1->size != d2->size ) - return d1->size > d2->size ? 1 : -1; - if (d1->alignment != d2->alignment) - return d1->alignment > d2->alignment ? 1 : -1; - if (d1->aligned_size != d2->aligned_size) - return d1->aligned_size > d2->aligned_size ? 1 : -1; + for (cpt=0; cptsize[cpt] != d2->size[cpt]) { + 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->category_code != d2->category_code) - return d1->category_code > d2->category_code ? 1 : -1; + if (d1->alignment[cpt] != d2->alignment[cpt]) { + 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->pre != d2->pre) - return d1->pre > d2->pre ? 1 : -1; - if (d1->post != d2->post) - return d1->post > d2->post ? 1 : -1; + if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) { + 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; + } + } + + if (d1->category_code != d2->category_code) { + DEBUG4("ddt_cmp: %s->cat=%s != %s->cat=%s", + d1->name,gras_datadesc_cat_names[d1->category_code], + d2->name,gras_datadesc_cat_names[d2->category_code]); + return d1->category_code > d2->category_code ? 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->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) { case e_gras_datadesc_type_cat_scalar: @@ -174,19 +224,27 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, case e_gras_datadesc_type_cat_struct: if (gras_dynar_length(d1->category.struct_data.fields) != - gras_dynar_length(d2->category.struct_data.fields)) + gras_dynar_length(d2->category.struct_data.fields)) { + DEBUG4("ddt_cmp: %s (having %d fields) != %s (having %d fields)", + d1->name, gras_dynar_length(d1->category.struct_data.fields), + d2->name, gras_dynar_length(d2->category.struct_data.fields)); + return gras_dynar_length(d1->category.struct_data.fields) > gras_dynar_length(d2->category.struct_data.fields) ? 1 : -1; - + } gras_dynar_foreach(d1->category.struct_data.fields, cpt, field1) { - gras_dynar_get(d2->category.struct_data.fields, cpt, field2); - gras_datadesc_by_id(field1->code,&field_desc_1); /* FIXME: errcode ignored */ - gras_datadesc_by_id(field2->code,&field_desc_2); + gras_dynar_get(d2->category.struct_data.fields, cpt, &field2); + field_desc_1 = field1->type; + field_desc_2 = field2->type; ret = gras_datadesc_type_cmp(field_desc_1,field_desc_2); - if (ret) + if (ret) { + DEBUG6("%s->field[%d]=%s != %s->field[%d]=%s", + d1->name,cpt,field1->name, + d2->name,cpt,field2->name); return ret; + } } break; @@ -204,8 +262,8 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, gras_dynar_foreach(d1->category.union_data.fields, cpt, field1) { gras_dynar_get(d2->category.union_data.fields, cpt, field2); - gras_datadesc_by_id(field1->code,&field_desc_1); /* FIXME: errcode ignored */ - gras_datadesc_by_id(field2->code,&field_desc_2); + field_desc_1 = field1->type; + field_desc_2 = field2->type; ret = gras_datadesc_type_cmp(field_desc_1,field_desc_2); if (ret) return ret; @@ -218,13 +276,13 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, if (d1->category.ref_data.selector != d2->category.ref_data.selector) return d1->category.ref_data.selector > d2->category.ref_data.selector ? 1 : -1; - if (d1->category.ref_data.code != d2->category.ref_data.code) - return d1->category.ref_data.code > d2->category.ref_data.code ? 1 : -1; + if (d1->category.ref_data.type != d2->category.ref_data.type) + return d1->category.ref_data.type > d2->category.ref_data.type ? 1 : -1; break; case e_gras_datadesc_type_cat_array: - if (d1->category.array_data.code != d2->category.array_data.code) - return d1->category.array_data.code > d2->category.array_data.code ? 1 : -1; + if (d1->category.array_data.type != d2->category.array_data.type) + return d1->category.array_data.type > d2->category.array_data.type ? 1 : -1; if (d1->category.array_data.fixed_size != d2->category.array_data.fixed_size) return d1->category.array_data.fixed_size > d2->category.array_data.fixed_size ? 1 : -1; @@ -259,7 +317,7 @@ gras_error_t gras_datadesc_cpy(gras_datadesc_type_t *type, 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) { @@ -271,8 +329,8 @@ gras_datadesc_send_rec(gras_socket_t *sock, 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) { @@ -284,22 +342,26 @@ gras_datadesc_send_rec(gras_socket_t *sock, 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)); + sub_type = field->type; 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); @@ -308,13 +370,16 @@ gras_datadesc_send_rec(gras_socket_t *sock, case e_gras_datadesc_type_cat_union: { gras_dd_cat_union_t union_data; - gras_dd_cat_field_t *field; + gras_dd_cat_field_t *field=NULL; int field_num; 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", @@ -329,33 +394,34 @@ gras_datadesc_send_rec(gras_socket_t *sock, /* Send the content */ gras_dynar_get(union_data.fields, field_num, field); - TRY(gras_datadesc_by_id(field->code, &sub_type)); + sub_type = field->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; } case e_gras_datadesc_type_cat_ref: { gras_dd_cat_ref_t ref_data; - int ref_code; void **ref=(void**)data; +#ifdef DETECT_CYCLE void *dummy; +#endif ref_data = type->category.ref_data; /* 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); - TRY(gras_dd_send_int(sock, ref_code)); + sub_type = ref_data.type; + if (sub_type == NULL) { + sub_type = (*ref_data.selector)(state,data); + TRY(gras_dd_send_int(sock, sub_type->code)); } /* Send the actual value of the pointer for cycle handling */ @@ -376,7 +442,6 @@ gras_datadesc_send_rec(gras_socket_t *sock, if (errcode == mismatch_error) { VERB1("Sending data referenced at %p", *ref); TRY(gras_dict_set_ext(refs, (char*)ref, sizeof(void*), ref, NULL)); - TRY(gras_datadesc_by_id(ref_code, &sub_type)); TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, *ref)); } else if (errcode == no_error) { @@ -399,18 +464,24 @@ gras_datadesc_send_rec(gras_socket_t *sock, /* 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)); } /* send the content */ - TRY(gras_datadesc_by_id(array_data.code, &sub_type)); + sub_type = array_data.type; elm_size = sub_type->aligned_size[GRAS_THISARCH]; - for (cpt=0; cptcategory_code == e_gras_datadesc_type_cat_scalar) { + 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 { + for (cpt=0; cptpost) { - type->post(state,type,data); - } - return no_error; } @@ -437,16 +504,16 @@ gras_error_t gras_datadesc_send(gras_socket_t *sock, 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; } @@ -455,39 +522,44 @@ gras_error_t gras_datadesc_send(gras_socket_t *sock, * gras_datadesc_recv_rec: * * Do the data reception job recursively. + * + * subsize used only to deal with vicious case of reference to dynamic array. + * This size is needed at the reference reception level (to allocate enough + * space) and at the array reception level (to fill enough room). + * + * Having this size passed as an argument of the recursive function is a crude + * hack, but I was told that working code is sometimes better than neat one ;) */ 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 **r_data, long int r_lgr, - char **dst) { + char *l_data, + int subsize) { gras_error_t errcode; - char *l_data = *dst; /* dereference to avoid typo */ int cpt; gras_datadesc_type_t *sub_type; - VERB1("Recv a %s", type->name); + VERB2("Recv a %s @%p", type->name, l_data); + gras_assert(l_data); switch (type->category_code) { case e_gras_datadesc_type_cat_scalar: - if (!l_data) { - TRY(gras_dd_alloc_ref(refs,type->size[GRAS_THISARCH],r_data,r_lgr, dst)); - l_data = *dst; - } - - 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,r_arch, l_data,l_data)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(type,1,r_arch, l_data,l_data)); } else { void *ptr = NULL; ptr = malloc((size_t)type->size[r_arch]); TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch])); - TRY(gras_dd_convert_elm(type,r_arch, ptr,l_data)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data)); free(ptr); } break; @@ -498,20 +570,18 @@ gras_datadesc_recv_rec(gras_socket_t *sock, struct_data = type->category.struct_data; - if (!l_data) { - TRY(gras_dd_alloc_ref(refs,type->size[GRAS_THISARCH],r_data,r_lgr, dst)); - l_data = *dst; - } - + 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]; - TRY(gras_datadesc_by_id(field->code, &sub_type)); + sub_type = field->type; TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, r_arch,NULL,0, - &field_data)); + field_data,-1)); } VERB1("<< Received all fields of the structure %s", type->name); @@ -520,16 +590,14 @@ gras_datadesc_recv_rec(gras_socket_t *sock, case e_gras_datadesc_type_cat_union: { gras_dd_cat_union_t union_data; - gras_dd_cat_field_t *field; + gras_dd_cat_field_t *field=NULL; int field_num; union_data = type->category.union_data; - if (!l_data) { - TRY(gras_dd_alloc_ref(refs,type->size[GRAS_THISARCH],r_data,r_lgr, dst)); - l_data = *dst; - } - + 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) @@ -542,11 +610,11 @@ gras_datadesc_recv_rec(gras_socket_t *sock, /* Recv the content */ gras_dynar_get(union_data.fields, field_num, field); - TRY(gras_datadesc_by_id(field->code, &sub_type)); + sub_type = field->type; TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, r_arch,NULL,0, - dst)); + l_data,-1)); break; } @@ -554,14 +622,16 @@ gras_datadesc_recv_rec(gras_socket_t *sock, char **r_ref = NULL; char **l_ref = NULL; gras_dd_cat_ref_t ref_data; - int ref_code; ref_data = type->category.ref_data; /* Get the referenced type locally or from peer */ - ref_code = ref_data.code; - if (ref_code < 0) + sub_type = ref_data.type; + if (sub_type == NULL) { + int ref_code; TRY(gras_dd_recv_int(sock, r_arch, &ref_code)); + TRY(gras_datadesc_by_id(ref_code, &sub_type)); + } /* Get the actual value of the pointer for cycle handling */ if (!pointer_type) { @@ -574,16 +644,12 @@ gras_datadesc_recv_rec(gras_socket_t *sock, TRY(gras_trp_chunk_recv(sock, (char*)r_ref, pointer_type->size[r_arch])); - if (!l_data) { - TRY(gras_dd_alloc_ref(refs,type->size[GRAS_THISARCH],r_data,r_lgr, dst)); - l_data = *dst; - } - /* Receive the pointed data only if not already sent */ if (gras_dd_is_r_null(r_ref, pointer_type->size[r_arch])) { - VERB1("Not receiving data remotely referenced at %p since it's NULL", + VERB1("Not receiving data remotely referenced @%p since it's NULL", *(void **)r_ref); *(void**)l_data = NULL; + free(r_ref); break; } errcode = gras_dict_get_ext(refs, @@ -592,28 +658,51 @@ gras_datadesc_recv_rec(gras_socket_t *sock, if (errcode == mismatch_error) { + int subsubcount = -1; void *l_referenced=NULL; - VERB1("Receiving data remotely referenced at %p", *(void**)r_ref); - TRY(gras_datadesc_by_id(ref_code, &sub_type)); - // DEBUG2("l_ref= %p; &l_ref=%p",l_referenced,&l_referenced); + VERB2("Receiving a ref to '%s', remotely @%p", + sub_type->name, *(void**)r_ref); + if (sub_type->category_code == e_gras_datadesc_type_cat_array) { + /* Damn. Reference to a dynamic array. Allocating the size for it + is more complicated */ + gras_dd_cat_array_t array_data = sub_type->category.array_data; + gras_datadesc_type_t *subsub_type; + + subsubcount = array_data.fixed_size; + if (subsubcount < 0) + TRY(gras_dd_recv_int(sock, r_arch, &subsubcount)); + + subsub_type = array_data.type; + + + TRY(gras_dd_alloc_ref(refs, + subsub_type->size[GRAS_THISARCH] * subsubcount, + r_ref,pointer_type->size[r_arch], + (char**)&l_referenced)); + } else { + TRY(gras_dd_alloc_ref(refs,sub_type->size[GRAS_THISARCH], + r_ref,pointer_type->size[r_arch], + (char**)&l_referenced)); + } + TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, r_arch,r_ref,pointer_type->size[r_arch], - (char**)&l_referenced)); + (char*)l_referenced, subsubcount)); *(void**)l_data=l_referenced; + VERB3("'%s' remotely referenced at %p locally at %p", + sub_type->name, *(void**)r_ref, l_referenced); } else if (errcode == no_error) { - VERB1("NOT receiving data remotely referenced at %p (already done). ", - *(void**)r_ref); - - VERB2("l_ref=%p; *l_ref=%p", l_ref,*l_ref); + VERB2("NOT receiving data remotely referenced @%p (already done, @%p here)", + *(void**)r_ref, *(void**)l_ref); *(void**)l_data=*l_ref; } else { return errcode; } - VERB1("*l_data=%p",*(void**)l_data); + free(r_ref); break; } @@ -624,28 +713,45 @@ gras_datadesc_recv_rec(gras_socket_t *sock, long int elm_size; array_data = type->category.array_data; - /* determine element count locally or from peer */ + /* determine element count locally, or from caller, or from peer */ count = array_data.fixed_size; if (count <= 0) + count = subsize; + if (count < 0) TRY(gras_dd_recv_int(sock, r_arch, &count)); if (count < 0) RAISE1(mismatch_error, "Invalid (negative) array size for type %s",type->name); /* receive the content */ - TRY(gras_datadesc_by_id(array_data.code, &sub_type)); - elm_size = sub_type->aligned_size[GRAS_THISARCH]; - - if (!l_data) { - TRY(gras_dd_alloc_ref(refs,elm_size*count,r_data,r_lgr, dst)); - l_data = *dst; - } - - ptr = l_data; - for (cpt=0; cptcategory_code == e_gras_datadesc_type_cat_scalar) { + VERB1("Array of %d scalars, get it in one shoot", count); + if (sub_type->aligned_size[GRAS_THISARCH] >= + sub_type->aligned_size[r_arch]) { + TRY(gras_trp_chunk_recv(sock, (char*)l_data, + sub_type->aligned_size[r_arch] * count)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(sub_type,count,r_arch, l_data,l_data)); + } else { + ptr = malloc((size_t)sub_type->aligned_size[r_arch] * count); + TRY(gras_trp_chunk_recv(sock, (char*)ptr, + sub_type->size[r_arch] * count)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data)); + free(ptr); + } + } else { + /* not scalar content, get it recursively (may contain pointers) */ + elm_size = sub_type->aligned_size[GRAS_THISARCH]; + VERB2("Receive a %d-long array of %s",count, sub_type->name); + + ptr = l_data; + for (cpt=0; cptrecv) + type->recv(state,l_data); + return no_error; } @@ -668,25 +777,21 @@ gras_error_t gras_datadesc_recv(gras_socket_t *sock, gras_datadesc_type_t *type, int r_arch, - void **dst) { + 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)); - if (!dst) - CRITICAL0("Cannot receive data into a NULL pointer!"); - if (*dst) - VERB0("'*dst' not NULL in datadesc_recv. Data to be copied there without malloc"); + TRY(gras_cbps_new(&state)); errcode = gras_datadesc_recv_rec(sock, state, refs, type, r_arch, NULL, 0, - (char **) dst); + (char *) dst,-1); gras_dict_free(&refs); - gras_dd_cbps_free(&state); + gras_cbps_free(&state); return errcode; }