X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60f31f9d24bd348ccad2ea99ba96424360b11a92..5fb2fa67ea062d8c26cfe3e6669a93fc2b7607bd:/src/gras/DataDesc/ddt_exchange.c diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index fb5b7b4bdd..bc6478901a 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -2,78 +2,55 @@ /* ddt_exchange - send/recv data described */ -/* Authors: Olivier Aumage, Martin Quinson */ -/* Copyright (C) 2003, 2004 the GRAS posse. */ +/* Copyright (c) 2003 Olivier Aumage. */ +/* Copyright (c) 2003, 2004, 2005 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 "DataDesc/datadesc_private.h" -#include "Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ - -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,datadesc); - -#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 +#include "gras/DataDesc/datadesc_private.h" +#include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_exchange,datadesc, + "Sending data over the network"); 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 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_datadesc_type_t int_type = NULL; +static gras_datadesc_type_t pointer_type = NULL; +static _XBT_INLINE xbt_error_t gras_dd_send_int(gras_socket_t sock, int i); +static _XBT_INLINE xbt_error_t gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i); -static inline gras_error_t -gras_dd_alloc_ref(gras_dict_t *refs, long int size, +static _XBT_INLINE xbt_error_t +gras_dd_alloc_ref(xbt_dict_t refs, long int size, char **r_ref, long int r_len, - char **l_ref); -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_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_cbps_t *state, - gras_dict_t *refs, - gras_datadesc_type_t *type, - int r_arch, - char **r_data, - long int r_lgr, - char *dst, - int subsize); + char **l_ref, int detect_cycle); +static _XBT_INLINE int +gras_dd_is_r_null(char **r_ptr, long int length); -static inline gras_error_t -gras_dd_send_int(gras_socket_t *sock,int i) { +static _XBT_INLINE xbt_error_t +gras_dd_send_int(gras_socket_t sock,int i) { if (!int_type) { int_type = gras_datadesc_by_name("int"); - gras_assert(int_type); + xbt_assert(int_type); } DEBUG1("send_int(%d)",i); return gras_trp_chunk_send(sock, (char*)&i, int_type->size[GRAS_THISARCH]); } -static inline gras_error_t -gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i) { - gras_error_t errcode; +static _XBT_INLINE xbt_error_t +gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) { + xbt_error_t errcode; if (!int_type) { int_type = gras_datadesc_by_name("int"); - gras_assert(int_type); + xbt_assert(int_type); } if (int_type->size[GRAS_THISARCH] >= int_type->size[r_arch]) { @@ -81,8 +58,8 @@ gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *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]); + void *ptr = xbt_malloc(int_type->size[r_arch]); + TRY(gras_trp_chunk_recv(sock, (char*)ptr, int_type->size[r_arch])); if (r_arch != GRAS_THISARCH) TRY(gras_dd_convert_elm(int_type,1,r_arch, ptr,i)); @@ -98,7 +75,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 inline int +static _XBT_INLINE int gras_dd_is_r_null(char **r_ptr, long int length) { int i; @@ -111,299 +88,689 @@ gras_dd_is_r_null(char **r_ptr, long int length) { return 1; } -static inline gras_error_t -gras_dd_alloc_ref(gras_dict_t *refs, +static _XBT_INLINE xbt_error_t +gras_dd_alloc_ref(xbt_dict_t refs, long int size, char **r_ref, long int r_len, /* pointer_type->size[r_arch] */ - char **l_ref) { + char **l_ref, + int detect_cycle) { char *l_data = NULL; - gras_assert1(size>0,"Cannot allocate %ld bytes!", size); - if (! (l_data = malloc((size_t)size)) ) - RAISE_MALLOC; + xbt_assert1(size>0,"Cannot allocate %ld bytes!", size); + l_data = xbt_malloc((size_t)size); *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=%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; + DEBUG5("alloc_ref: l_data=%p, &l_data=%p; r_ref=%p; *r_ref=%p, r_len=%ld", + (void*)l_data,(void*)&l_data, + (void*)r_ref, (void*)(r_ref?*r_ref:NULL), r_len); + if (detect_cycle && r_ref && !gras_dd_is_r_null( r_ref, r_len)) { + void *ptr = xbt_malloc(sizeof(void *)); + CRITICAL0("Check for cycles"); memcpy(ptr,l_ref, sizeof(void *)); - DEBUG2("Insert %p under %p",*(void**)ptr, *(void**)r_ref); + DEBUG2("Insert l_ref=%p under r_ref=%p",*(void**)ptr, *(void**)r_ref); - TRY(gras_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free)); + if (detect_cycle) + xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free); } -#endif return no_error; } /** - * gras_datadesc_type_cmp: + * gras_datadesc_cpy: * - * Compares two datadesc types with the same semantic than strcmp. + * Copy the data pointed by src and described by type + * to a new location, and store a pointer to it in dst. * - * This comparison does not take the set headers into account (name and ID), - * but only the payload (actual type description). */ -int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, - const gras_datadesc_type_t *d2) { - int ret,cpt; - gras_dd_cat_field_t *field1,*field2; - gras_datadesc_type_t *field_desc_1,*field_desc_2; +xbt_error_t gras_datadesc_cpy(gras_datadesc_type_t type, + void *src, + void **dst) { + RAISE_UNIMPLEMENTED; +} - if (d1 == d2) return 0; /* easy optimization */ +/*** + *** Direct use functions + ***/ + +static xbt_error_t +gras_datadesc_send_rec(gras_socket_t sock, + gras_cbps_t state, + xbt_dict_t refs, + gras_datadesc_type_t type, + char *data, + int detect_cycle) { + + xbt_error_t errcode; + int cpt; + gras_datadesc_type_t sub_type; /* type on which we recurse */ + + VERB2("Send a %s (%s)", + type->name, gras_datadesc_cat_names[type->category_code]); - if (!d1 && d2) { - DEBUG0("ddt_cmp: !d1 && d2 => 1"); - return 1; + if (type->send) { + type->send(type,state,data); } - if (!d1 && !d2) { - DEBUG0("ddt_cmp: !d1 && !d2 => 0"); - return 0; + + switch (type->category_code) { + case e_gras_datadesc_type_cat_scalar: + TRY(gras_trp_chunk_send(sock, data, type->size[GRAS_THISARCH])); + break; + + case e_gras_datadesc_type_cat_struct: { + gras_dd_cat_struct_t struct_data; + gras_dd_cat_field_t field; + char *field_data; + + struct_data = type->category.struct_data; + xbt_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); + xbt_dynar_foreach(struct_data.fields, cpt, field) { + field_data = data; + field_data += field->offset[GRAS_THISARCH]; + + sub_type = field->type; + + if (field->send) + field->send(type,state,field_data); + + VERB1("Send field %s",field->name); + TRY(gras_datadesc_send_rec(sock,state,refs,sub_type, field_data, + detect_cycle || sub_type->cycle)); + + } + VERB1("<< Sent all fields of the structure %s", type->name); + + break; } - if ( d1 && !d2) { - DEBUG0("ddt_cmp: d1 && !d2 => -1"); - return -1; + + case e_gras_datadesc_type_cat_union: { + gras_dd_cat_union_t union_data; + gras_dd_cat_field_t field=NULL; + int field_num; + + union_data = type->category.union_data; + + xbt_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(type, state, data); + + xbt_assert1(field_num > 0, + "union field selector of %s gave a negative value", + type->name); + + xbt_assert3(field_num < xbt_dynar_length(union_data.fields), + "union field selector of %s returned %d but there is only %lu fields", + type->name, field_num, xbt_dynar_length(union_data.fields)); + + /* Send the field number */ + TRY(gras_dd_send_int(sock, field_num)); + + /* Send the content */ + field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t); + sub_type = field->type; + + if (field->send) + field->send(type,state,data); + + TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, data, + detect_cycle || sub_type->cycle)); + + break; } + + case e_gras_datadesc_type_cat_ref: { + gras_dd_cat_ref_t ref_data; - 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; + void **ref=(void**)data; + void *dummy; + + ref_data = type->category.ref_data; + + /* Detect the referenced type and send it to peer if needed */ + sub_type = ref_data.type; + if (sub_type == NULL) { + sub_type = (*ref_data.selector)(type,state,data); + TRY(gras_dd_send_int(sock, sub_type->code)); } - - 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; + + /* Send the actual value of the pointer for cycle handling */ + if (!pointer_type) { + pointer_type = gras_datadesc_by_name("data pointer"); + xbt_assert(pointer_type); } - - 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; + + TRY(gras_trp_chunk_send(sock, (char*)data, + pointer_type->size[GRAS_THISARCH])); + + /* Send the pointed data only if not already sent */ + if (*(void**)data == NULL) { + VERB0("Not sending NULL referenced data"); + break; } + errcode = detect_cycle + ? xbt_dict_get_ext(refs,(char*)ref, sizeof(void*), &dummy) + : mismatch_error; + if (errcode == mismatch_error) { + VERB1("Sending data referenced at %p", (void*)*ref); + if (detect_cycle) + xbt_dict_set_ext(refs, (char*)ref, sizeof(void*), ref, NULL); + TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, *ref, + detect_cycle || sub_type->cycle)); + + } else if (errcode == no_error) { + VERB1("Not sending data referenced at %p (already done)", (void*)*ref); + } else { + return errcode; + } + + break; } - 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; + case e_gras_datadesc_type_cat_array: { + gras_dd_cat_array_t array_data; + long int count; + char *ptr=data; + long int elm_size; + + array_data = type->category.array_data; + + /* determine and send the element count */ + count = array_data.fixed_size; + if (count == 0) { + count = array_data.dynamic_size(type,state,data); + xbt_assert1(count >=0, + "Invalid (negative) array size for type %s",type->name); + TRY(gras_dd_send_int(sock, count)); + } + + /* send the content */ + sub_type = array_data.type; + elm_size = sub_type->aligned_size[GRAS_THISARCH]; + if (sub_type->category_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 if (sub_type->category_code == e_gras_datadesc_type_cat_array && + sub_type->category.array_data.fixed_size > 0 && + sub_type->category.array_data.type->category_code == e_gras_datadesc_type_cat_scalar) { + + VERB1("Array of %ld fixed array of scalars, send it in one shot",count); + TRY(gras_trp_chunk_send(sock, data, + sub_type->category.array_data.type->aligned_size[GRAS_THISARCH] + * count * sub_type->category.array_data.fixed_size)); + + } else { + for (cpt=0; cptcycle)); + ptr += elm_size; + } + } + break; } - 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; + default: + xbt_assert0(0, "Invalid type"); } - 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; - } + return no_error; +} + +/** + * gras_datadesc_send: + * + * Copy the data pointed by src and described by type to the socket + * + */ +xbt_error_t gras_datadesc_send(gras_socket_t sock, + gras_datadesc_type_t type, + void *src) { + + xbt_error_t errcode; + gras_cbps_t state; + xbt_dict_t refs; /* all references already sent */ + + xbt_assert0(type,"called with NULL type descriptor"); + + refs = xbt_dict_new(); + state = gras_cbps_new(); + + errcode = gras_datadesc_send_rec(sock,state,refs,type,(char*)src, type->cycle); + + xbt_dict_free(&refs); + gras_cbps_free(&state); + + return errcode; +} + +/** + * 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 ;) + */ +static xbt_error_t +gras_datadesc_recv_rec(gras_socket_t sock, + gras_cbps_t state, + xbt_dict_t refs, + gras_datadesc_type_t type, + int r_arch, + char **r_data, + long int r_lgr, + char *l_data, + int subsize, + int detect_cycle) { - switch (d1->category_code) { + xbt_error_t errcode; + int cpt; + gras_datadesc_type_t sub_type; + + VERB2("Recv a %s @%p", type->name, (void*)l_data); + xbt_assert(l_data); + + switch (type->category_code) { case e_gras_datadesc_type_cat_scalar: - if (d1->category.scalar_data.encoding != d2->category.scalar_data.encoding) - return d1->category.scalar_data.encoding > d2->category.scalar_data.encoding ? 1 : -1 ; + if (type->size[GRAS_THISARCH] == type->size[r_arch]) { + TRY(gras_trp_chunk_recv(sock, (char*)l_data, type->size[r_arch])); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(type,1,r_arch, l_data,l_data)); + } else { + void *ptr = xbt_malloc(type->size[r_arch]); + + TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch])); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data)); + free(ptr); + } break; + + case e_gras_datadesc_type_cat_struct: { + gras_dd_cat_struct_t struct_data; + gras_dd_cat_field_t field; + + struct_data = type->category.struct_data; + + xbt_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); + xbt_dynar_foreach(struct_data.fields, cpt, field) { + char *field_data = l_data + field->offset[GRAS_THISARCH]; + + sub_type = field->type; + + TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, + r_arch,NULL,0, + field_data,-1, + detect_cycle || sub_type->cycle)); + + if (field->recv) + field->recv(type,state,(void*)l_data); - case e_gras_datadesc_type_cat_struct: - if (gras_dynar_length(d1->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); - field_desc_1 = field1->type; - field_desc_2 = field2->type; - ret = gras_datadesc_type_cmp(field_desc_1,field_desc_2); - if (ret) { - DEBUG6("%s->field[%d]=%s != %s->field[%d]=%s", - d1->name,cpt,field1->name, - d2->name,cpt,field2->name); - return ret; - } - } + VERB1("<< Received all fields of the structure %s", type->name); + break; + } + + case e_gras_datadesc_type_cat_union: { + gras_dd_cat_union_t union_data; + gras_dd_cat_field_t field=NULL; + int field_num; + + union_data = type->category.union_data; + + xbt_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) + RAISE1(mismatch_error, + "Received union field for %s is negative", type->name); + if (field_num < xbt_dynar_length(union_data.fields)) + RAISE3(mismatch_error, + "Received union field for %s is %d but there is only %lu fields", + type->name, field_num, xbt_dynar_length(union_data.fields)); - case e_gras_datadesc_type_cat_union: - if (d1->category.union_data.selector != d2->category.union_data.selector) - return d1->category.union_data.selector > d2->category.union_data.selector ? 1 : -1; + /* Recv the content */ + field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t); + sub_type = field->type; - if (gras_dynar_length(d1->category.union_data.fields) != - gras_dynar_length(d2->category.union_data.fields)) - return gras_dynar_length(d1->category.union_data.fields) > - gras_dynar_length(d2->category.union_data.fields) ? - 1 : -1; + TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, + r_arch,NULL,0, + l_data,-1, + detect_cycle || sub_type->cycle)); + if (field->recv) + field->recv(type,state,l_data); + + break; + } + + case e_gras_datadesc_type_cat_ref: { + char **r_ref = NULL; + char **l_ref = NULL; + gras_dd_cat_ref_t ref_data; - gras_dynar_foreach(d1->category.union_data.fields, cpt, field1) { - - gras_dynar_get(d2->category.union_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) - return ret; + ref_data = type->category.ref_data; + + /* Get the referenced type locally or from peer */ + 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) { + pointer_type = gras_datadesc_by_name("data pointer"); + xbt_assert(pointer_type); + } + + r_ref = xbt_malloc(pointer_type->size[r_arch]); + + TRY(gras_trp_chunk_recv(sock, (char*)r_ref, + pointer_type->size[r_arch])); + + /* 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 @%p since it's NULL", + *(void **)r_ref); + *(void**)l_data = NULL; + free(r_ref); + break; + } + + errcode = detect_cycle + ? xbt_dict_get_ext(refs, + (char*)r_ref, pointer_type->size[r_arch], + (void**)&l_ref) + : mismatch_error; + + if (errcode == mismatch_error) { + int subsubcount = 0; + void *l_referenced=NULL; + + 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, + detect_cycle)); + } else { + TRY(gras_dd_alloc_ref(refs,sub_type->size[GRAS_THISARCH], + r_ref,pointer_type->size[r_arch], + (char**)&l_referenced, + detect_cycle)); + } + + TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, + r_arch,r_ref,pointer_type->size[r_arch], + (char*)l_referenced, subsubcount, + detect_cycle || sub_type->cycle)); + + *(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) { + 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; } + free(r_ref); break; - - - case e_gras_datadesc_type_cat_ref: - 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.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.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; - - if (d1->category.array_data.dynamic_size != d2->category.array_data.dynamic_size) - return d1->category.array_data.dynamic_size > d2->category.array_data.dynamic_size ? 1 : -1; - + } + + case e_gras_datadesc_type_cat_array: { + gras_dd_cat_array_t array_data; + int count; + char *ptr; + long int elm_size; + + array_data = type->category.array_data; + /* 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 (=0) array size for type %s",type->name); + + /* receive the content */ + sub_type = array_data.type; + if (sub_type->category_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 = xbt_malloc(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 if (sub_type->category_code == e_gras_datadesc_type_cat_array && + sub_type->category.array_data.fixed_size > 0 && + sub_type->category.array_data.type->category_code == e_gras_datadesc_type_cat_scalar) { + gras_datadesc_type_t subsub_type; + array_data = sub_type->category.array_data; + subsub_type = array_data.type; + + VERB1("Array of %d fixed array of scalars, get it in one shot",count); + if (subsub_type->aligned_size[GRAS_THISARCH] >= + subsub_type->aligned_size[r_arch]) { + TRY(gras_trp_chunk_recv(sock, (char*)l_data, + subsub_type->aligned_size[r_arch] * count * + array_data.fixed_size)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,r_arch, l_data,l_data)); + } else { + ptr = xbt_malloc(subsub_type->aligned_size[r_arch] * count*array_data.fixed_size); + + TRY(gras_trp_chunk_recv(sock, (char*)ptr, + subsub_type->size[r_arch] * count*array_data.fixed_size)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,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; cptcycle)); + + ptr += elm_size; + } + } break; - - case e_gras_datadesc_type_cat_ignored: - /* That's ignored... */ + } + default: - /* two stupidly created ddt are equally stupid ;) */ - break; + xbt_assert0(0, "Invalid type"); } - return 0; + if (type->recv) + type->recv(type,state,l_data); + + return no_error; } /** - * gras_datadesc_cpy: + * gras_datadesc_recv: * - * Copy the data pointed by src and described by type - * to a new location, and store a pointer to it in dst. + * Get an instance of the datatype described by @type from the @socket, + * and store a pointer to it in @dst * */ -gras_error_t gras_datadesc_cpy(gras_datadesc_type_t *type, - void *src, - void **dst) { - RAISE_UNIMPLEMENTED; -} +xbt_error_t +gras_datadesc_recv(gras_socket_t sock, + gras_datadesc_type_t type, + int r_arch, + void *dst) { -static gras_error_t -gras_datadesc_send_rec(gras_socket_t *sock, - gras_cbps_t *state, - gras_dict_t *refs, - gras_datadesc_type_t *type, - char *data) { + xbt_error_t errcode; + gras_cbps_t state; /* callback persistent state */ + xbt_dict_t refs; /* all references already sent */ - gras_error_t errcode; - int cpt; - gras_datadesc_type_t *sub_type; /* type on which we recurse */ + refs = xbt_dict_new(); + state = gras_cbps_new(); + + xbt_assert0(type,"called with NULL type descriptor"); + errcode = gras_datadesc_recv_rec(sock, state, refs, type, + r_arch, NULL, 0, + (char *) dst,-1, + type->cycle); + + xbt_dict_free(&refs); + gras_cbps_free(&state); + + return errcode; +} + +#if 0 +/*** + *** IDL compiling functions + ***/ + +#define gras_datadesc_send_rec foo /* Just to make sure the copypast was ok */ +#define gras_datadesc_send foo /* Just to make sure the copypast was ok */ +#define gras_datadesc_recv_rec foo /* Just to make sure the copypast was ok */ +#define gras_datadesc_recv foo /* Just to make sure the copypast was ok */ + +static xbt_error_t +gras_datadesc_gen_send_rec(gras_socket_t sock, + gras_cbps_t state, + xbt_dict_t refs, + gras_datadesc_type_t type, + char *data, + int detect_cycle) { + + xbt_error_t errcode; + int cpt; + gras_datadesc_type_t sub_type; /* type on which we recurse */ - VERB2("Send a %s (%s)", - type->name, gras_datadesc_cat_names[type->category_code]); + printf(" VERB2(\"Send a %s (%s)\");\n", + type->name, gras_datadesc_cat_names[type->category_code]); - if (type->send) { - type->send(state,data); - } + xbt_assert0(!type->send, "Callbacks not implemented in IDL compiler"); switch (type->category_code) { case e_gras_datadesc_type_cat_scalar: - TRY(gras_trp_chunk_send(sock, data, type->size[GRAS_THISARCH])); + printf(" TRY(gras_trp_chunk_send(sock, data, %lu));\n",type->size[GRAS_THISARCH]); break; case e_gras_datadesc_type_cat_struct: { - gras_dd_cat_struct_t struct_data; - gras_dd_cat_field_t *field; - char *field_data; + 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, + xbt_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) { + printf(" VERB1(\">> Send all fields of the structure %s\");\n",type->name); + xbt_dynar_foreach(struct_data.fields, cpt, field) { field_data = data; field_data += field->offset[GRAS_THISARCH]; sub_type = field->type; - if (field->pre) - field->pre(state,field_data); + xbt_assert0(!field->send, "Callbacks not implemented in IDL compiler"); - VERB1("Send field %s",field->name); - TRY(gras_datadesc_send_rec(sock,state,refs,sub_type, field_data)); + printf(" VERB1(\"Send field %s\");\n",field->name); + printf(" data += %lu;\n",field->offset[GRAS_THISARCH]); + TRY(gras_datadesc_gen_send_rec(sock,state,refs,sub_type, field_data, + detect_cycle || sub_type->cycle)); + printf(" data -= %lu;\n",field->offset[GRAS_THISARCH]); - if (field->post) - field->post(state,field_data); + xbt_assert0(!field->recv, "Callbacks not implemented in IDL compiler"); } - VERB1("<< Sent all fields of the structure %s", type->name); + printf(" VERB1(\"<< Sent all fields of the structure %s\"", type->name); break; } case e_gras_datadesc_type_cat_union: { - gras_dd_cat_union_t union_data; - gras_dd_cat_field_t *field=NULL; - int field_num; + gras_dd_cat_union_t union_data; + gras_dd_cat_field_t field=NULL; + int field_num; union_data = type->category.union_data; - gras_assert1(union_data.closed, + xbt_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, data); + printf(" field_num = union_data.selector(state, data);\n"); - gras_assert1(field_num > 0, - "union field selector of %s gave a negative value", - type->name); + printf(" xbt_assert0(field_num > 0,\n"); + printf(" \"union field selector of %s gave a negative value\");\n",type->name); - gras_assert3(field_num < gras_dynar_length(union_data.fields), - "union field selector of %s returned %d but there is only %d fields", - type->name, field_num, gras_dynar_length(union_data.fields)); + printf(" xbt_assert3(field_num < xbt_dynar_length(union_data.fields),\n"); + printf(" \"union field selector of %s returned %%d but there is only %lu fields\",field_num);\n", + type->name, xbt_dynar_length(union_data.fields)); /* Send the field number */ - TRY(gras_dd_send_int(sock, field_num)); + printf("TRY(gras_dd_send_int(sock, field_num));\n"); /* Send the content */ - gras_dynar_get(union_data.fields, field_num, field); + field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t); sub_type = field->type; - if (field->pre) - field->pre(state,data); - - TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, data)); - - if (field->post) - field->post(state,data); + if (field->send) + field->send(state,data); + TRY(gras_datadesc_gen_send_rec(sock,state,refs, sub_type, data, + detect_cycle || sub_type->cycle)); + break; } @@ -411,9 +778,7 @@ gras_datadesc_send_rec(gras_socket_t *sock, gras_dd_cat_ref_t ref_data; void **ref=(void**)data; -#ifdef DETECT_CYCLE void *dummy; -#endif ref_data = type->category.ref_data; @@ -427,7 +792,7 @@ gras_datadesc_send_rec(gras_socket_t *sock, /* Send the actual value of the pointer for cycle handling */ if (!pointer_type) { pointer_type = gras_datadesc_by_name("data pointer"); - gras_assert(pointer_type); + xbt_assert(pointer_type); } TRY(gras_trp_chunk_send(sock, (char*)data, @@ -438,16 +803,20 @@ gras_datadesc_send_rec(gras_socket_t *sock, VERB0("Not sending NULL referenced data"); break; } - errcode = gras_dict_get_ext(refs,(char*)ref, sizeof(void*), &dummy); + errcode = detect_cycle + ? xbt_dict_get_ext(refs,(char*)ref, sizeof(void*), &dummy) + : mismatch_error; 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_send_rec(sock,state,refs, sub_type, *ref)); - + VERB1("Sending data referenced at %p", (void*)*ref); + if (detect_cycle) + xbt_dict_set_ext(refs, (char*)ref, sizeof(void*), ref, NULL); + TRY(gras_datadesc_gen_send_rec(sock,state,refs, sub_type, *ref, + detect_cycle || sub_type->cycle)); + } else if (errcode == no_error) { - VERB1("Not sending data referenced at %p (already done)", *ref); + VERB1("Not sending data referenced at %p (already done)", (void*)*ref); } else { - return errcode; + return errcode; } break; @@ -463,9 +832,9 @@ gras_datadesc_send_rec(gras_socket_t *sock, /* determine and send the element count */ count = array_data.fixed_size; - if (count <= 0) { + if (count == 0) { count = array_data.dynamic_size(state,data); - gras_assert1(count >=0, + xbt_assert1(count >=0, "Invalid (negative) array size for type %s",type->name); TRY(gras_dd_send_int(sock, count)); } @@ -477,9 +846,19 @@ gras_datadesc_send_rec(gras_socket_t *sock, 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 if (sub_type->category_code == e_gras_datadesc_type_cat_array && + sub_type->category.array_data.fixed_size > 0 && + sub_type->category.array_data.type->category_code == e_gras_datadesc_type_cat_scalar) { + + VERB1("Array of %ld fixed array of scalars, send it in one shot",count); + TRY(gras_trp_chunk_send(sock, data, + sub_type->category.array_data.type->aligned_size[GRAS_THISARCH] + * count * sub_type->category.array_data.fixed_size)); + } else { for (cpt=0; cptcycle)); ptr += elm_size; } } @@ -487,39 +866,43 @@ gras_datadesc_send_rec(gras_socket_t *sock, } default: - gras_assert0(0, "Invalid type"); + xbt_assert0(0, "Invalid type"); } return no_error; } /** - * gras_datadesc_send: + * gras_datadesc_gen_send: * * Copy the data pointed by src and described by type to the socket * */ -gras_error_t gras_datadesc_send(gras_socket_t *sock, - gras_datadesc_type_t *type, - void *src) { +xbt_error_t gras_datadesc_gen_send(gras_socket_t sock, + gras_datadesc_type_t type, + void *src) { - gras_error_t errcode; - gras_cbps_t *state = NULL; - gras_dict_t *refs; /* all references already sent */ + xbt_error_t errcode; + gras_cbps_t state; + xbt_dict_t refs; /* all references already sent */ - TRY(gras_dict_new(&refs)); - TRY(gras_cbps_new(&state)); - - errcode = gras_datadesc_send_rec(sock,state,refs,type,(char*)src); - - gras_dict_free(&refs); + refs = xbt_dict_new(); + state = gras_cbps_new(); + + printf("xbt_error_t gras_%s_send(gras_socket_t sock,void *dst){\n", + type->name); + errcode = gras_datadesc_gen_send_rec(sock,state,refs,type,(char*)src, + detect_cycle || sub_type->cycle); + printf("}\n"); + + xbt_dict_free(&refs); gras_cbps_free(&state); return errcode; } /** - * gras_datadesc_recv_rec: + * gras_datadesc_gen_recv_rec: * * Do the data reception job recursively. * @@ -530,23 +913,24 @@ gras_error_t gras_datadesc_send(gras_socket_t *sock, * 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_cbps_t *state, - gras_dict_t *refs, - gras_datadesc_type_t *type, - int r_arch, - char **r_data, - long int r_lgr, - char *l_data, - int subsize) { - - gras_error_t errcode; - int cpt; - gras_datadesc_type_t *sub_type; - - VERB2("Recv a %s @%p", type->name, l_data); - gras_assert(l_data); +static xbt_error_t +gras_datadesc_gen_recv_rec(gras_socket_t sock, + gras_cbps_t state, + xbt_dict_t refs, + gras_datadesc_type_t type, + int r_arch, + char **r_data, + long int r_lgr, + char *l_data, + int subsize, + int detect_cycle) { + + xbt_error_t errcode; + int cpt; + gras_datadesc_type_t sub_type; + + VERB2("Recv a %s @%p", type->name, (void*)l_data); + xbt_assert(l_data); switch (type->category_code) { case e_gras_datadesc_type_cat_scalar: @@ -555,8 +939,8 @@ gras_datadesc_recv_rec(gras_socket_t *sock, 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]); + void *ptr = xbt_malloc(type->size[r_arch]); + TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch])); if (r_arch != GRAS_THISARCH) TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data)); @@ -565,23 +949,27 @@ gras_datadesc_recv_rec(gras_socket_t *sock, break; case e_gras_datadesc_type_cat_struct: { - gras_dd_cat_struct_t struct_data; - gras_dd_cat_field_t *field; + gras_dd_cat_struct_t struct_data; + gras_dd_cat_field_t field; struct_data = type->category.struct_data; - gras_assert1(struct_data.closed, + xbt_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) { + xbt_dynar_foreach(struct_data.fields, cpt, field) { char *field_data = l_data + field->offset[GRAS_THISARCH]; sub_type = field->type; - TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, - r_arch,NULL,0, - field_data,-1)); + TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type, + r_arch,NULL,0, + field_data,-1, + detect_cycle || sub_type->cycle)); + if (field->recv) + field->recv(type,state,data); + } VERB1("<< Received all fields of the structure %s", type->name); @@ -589,13 +977,13 @@ 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=NULL; - int field_num; + gras_dd_cat_union_t union_data; + gras_dd_cat_field_t field=NULL; + int field_num; union_data = type->category.union_data; - gras_assert1(union_data.closed, + xbt_assert1(union_data.closed, "Please call gras_datadesc_declare_union_close on %s before receiving it", type->name); /* retrieve the field number */ @@ -603,18 +991,22 @@ gras_datadesc_recv_rec(gras_socket_t *sock, if (field_num < 0) RAISE1(mismatch_error, "Received union field for %s is negative", type->name); - if (field_num < gras_dynar_length(union_data.fields)) + if (field_num < xbt_dynar_length(union_data.fields)) RAISE3(mismatch_error, - "Received union field for %s is %d but there is only %d fields", - type->name, field_num, gras_dynar_length(union_data.fields)); + "Received union field for %s is %d but there is only %lu fields", + type->name, field_num, xbt_dynar_length(union_data.fields)); /* Recv the content */ - gras_dynar_get(union_data.fields, field_num, field); + field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t); sub_type = field->type; - TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, - r_arch,NULL,0, - l_data,-1)); + TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type, + r_arch,NULL,0, + l_data,-1, + detect_cycle || sub_type->cycle)); + if (field->recv) + field->recv(type,state,data); + break; } @@ -636,11 +1028,11 @@ gras_datadesc_recv_rec(gras_socket_t *sock, /* Get the actual value of the pointer for cycle handling */ if (!pointer_type) { pointer_type = gras_datadesc_by_name("data pointer"); - gras_assert(pointer_type); + xbt_assert(pointer_type); } - if (! (r_ref = malloc((size_t)pointer_type->size[r_arch])) ) - RAISE_MALLOC; + r_ref = xbt_malloc(pointer_type->size[r_arch]); + TRY(gras_trp_chunk_recv(sock, (char*)r_ref, pointer_type->size[r_arch])); @@ -652,13 +1044,15 @@ gras_datadesc_recv_rec(gras_socket_t *sock, free(r_ref); break; } - errcode = gras_dict_get_ext(refs, + + errcode = detect_cycle + ? xbt_dict_get_ext(refs, (char*)r_ref, pointer_type->size[r_arch], - (void**)&l_ref); - + (void**)&l_ref) + : mismatch_error; if (errcode == mismatch_error) { - int subsubcount = -1; + int subsubcount = 0; void *l_referenced=NULL; VERB2("Receiving a ref to '%s', remotely @%p", @@ -667,10 +1061,10 @@ gras_datadesc_recv_rec(gras_socket_t *sock, /* 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; + gras_datadesc_type_t subsub_type; subsubcount = array_data.fixed_size; - if (subsubcount < 0) + if (subsubcount == 0) TRY(gras_dd_recv_int(sock, r_arch, &subsubcount)); subsub_type = array_data.type; @@ -679,16 +1073,20 @@ gras_datadesc_recv_rec(gras_socket_t *sock, TRY(gras_dd_alloc_ref(refs, subsub_type->size[GRAS_THISARCH] * subsubcount, r_ref,pointer_type->size[r_arch], - (char**)&l_referenced)); + (char**)&l_referenced, + detect_cycle)); } else { TRY(gras_dd_alloc_ref(refs,sub_type->size[GRAS_THISARCH], r_ref,pointer_type->size[r_arch], - (char**)&l_referenced)); + (char**)&l_referenced, + detect_cycle)); } - TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type, - r_arch,r_ref,pointer_type->size[r_arch], - (char*)l_referenced, subsubcount)); + TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type, + r_arch,r_ref,pointer_type->size[r_arch], + (char*)l_referenced, subsubcount, + detect_cycle || sub_type->cycle)); + *(void**)l_data=l_referenced; VERB3("'%s' remotely referenced at %p locally at %p", sub_type->name, *(void**)r_ref, l_referenced); @@ -715,13 +1113,13 @@ gras_datadesc_recv_rec(gras_socket_t *sock, array_data = type->category.array_data; /* determine element count locally, or from caller, or from peer */ count = array_data.fixed_size; - if (count <= 0) + if (count == 0) count = subsize; - if (count < 0) + if (count == 0) TRY(gras_dd_recv_int(sock, r_arch, &count)); - if (count < 0) + if (count == 0) RAISE1(mismatch_error, - "Invalid (negative) array size for type %s",type->name); + "Invalid (=0) array size for type %s",type->name); /* receive the content */ sub_type = array_data.type; @@ -734,13 +1132,40 @@ gras_datadesc_recv_rec(gras_socket_t *sock, 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); + ptr = xbt_malloc(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 if (sub_type->category_code == e_gras_datadesc_type_cat_array && + sub_type->category.array_data.fixed_size > 0 && + sub_type->category.array_data.type->category_code == e_gras_datadesc_type_cat_scalar) { + gras_datadesc_type_t subsub_type; + array_data = sub_type->category.array_data; + subsub_type = array_data.type; + + VERB1("Array of %d fixed array of scalars, get it in one shot",count); + if (subsub_type->aligned_size[GRAS_THISARCH] >= + subsub_type->aligned_size[r_arch]) { + TRY(gras_trp_chunk_recv(sock, (char*)l_data, + subsub_type->aligned_size[r_arch] * count * + array_data.fixed_size)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,r_arch, l_data,l_data)); + } else { + ptr = xbt_malloc(subsub_type->aligned_size[r_arch] * count*array_data.fixed_size); + + TRY(gras_trp_chunk_recv(sock, (char*)ptr, + subsub_type->size[r_arch] * count*array_data.fixed_size)); + if (r_arch != GRAS_THISARCH) + TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,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]; @@ -748,8 +1173,10 @@ gras_datadesc_recv_rec(gras_socket_t *sock, ptr = l_data; for (cpt=0; cptcycle)); + ptr += elm_size; } } @@ -757,41 +1184,47 @@ gras_datadesc_recv_rec(gras_socket_t *sock, } default: - gras_assert0(0, "Invalid type"); + xbt_assert0(0, "Invalid type"); } if (type->recv) - type->recv(state,l_data); + type->recv(type,state,l_data); return no_error; } /** - * gras_datadesc_recv: + * gras_datadesc_gen_recv: * * Get an instance of the datatype described by @type from the @socket, * and store a pointer to it in @dst * */ -gras_error_t -gras_datadesc_recv(gras_socket_t *sock, - gras_datadesc_type_t *type, - int r_arch, - void *dst) { +xbt_error_t +gras_datadesc_gen_recv(gras_socket_t sock, + gras_datadesc_type_t type, + int r_arch, + void *dst) { - gras_error_t errcode; - gras_cbps_t *state = NULL; /* callback persistent state */ - gras_dict_t *refs; /* all references already sent */ + xbt_error_t errcode; + gras_cbps_t state; /* callback persistent state */ + xbt_dict_t refs; /* all references already sent */ - TRY(gras_dict_new(&refs)); - TRY(gras_cbps_new(&state)); + refs = xbt_dict_new(); + state = gras_cbps_new(); - errcode = gras_datadesc_recv_rec(sock, state, refs, type, - r_arch, NULL, 0, - (char *) dst,-1); + printf("xbt_error_t gras_%s_recv(gras_socket_t sock,void *dst){\n", + type->name); + + errcode = gras_datadesc_gen_recv_rec(sock, state, refs, type, + r_arch, NULL, 0, + (char *) dst,-1, + sub_type->cycle); - gras_dict_free(&refs); + printf("}\n"); + xbt_dict_free(&refs); gras_cbps_free(&state); return errcode; } +#endif