/* ddt_exchange - send/recv data described */
/* Copyright (c) 2003 Olivier Aumage. */
-/* Copyright (c) 2003, 2004 Martin Quinson. */
+/* Copyright (c) 2003, 2004, 2005 Martin Quinson. */
/* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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));
- xbt_free(ptr);
+ free(ptr);
}
DEBUG1("recv_int(%d)",*i);
l_data = xbt_malloc((size_t)size);
*l_ref = l_data;
- DEBUG2("l_data=%p, &l_data=%p",(void*)l_data,(void*)&l_data);
-
- DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%ld",
+ 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("detect_cycle");
+ 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);
if (detect_cycle)
- xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, xbt_free_fct);
+ xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free);
}
return no_error;
}
type->name, gras_datadesc_cat_names[type->category_code]);
if (type->send) {
- type->send(state,data);
+ type->send(type,state,data);
}
switch (type->category_code) {
sub_type = field->type;
- if (field->pre)
- field->pre(state,field_data);
+ 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));
+ TRY(gras_datadesc_send_rec(sock,state,refs,sub_type, field_data,
+ detect_cycle || sub_type->cycle));
- if (field->post)
- field->post(state,field_data);
}
VERB1("<< Sent all fields of the structure %s", type->name);
"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);
+ field_num = union_data.selector(type, state, data);
xbt_assert1(field_num > 0,
"union field selector of %s gave a negative value",
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, detect_cycle || sub_type->cycle));
-
- if (field->post)
- field->post(state,data);
+ 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;
}
/* 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)(state,data);
+ sub_type = (*ref_data.selector)(type,state,data);
TRY(gras_dd_send_int(sock, sub_type->code));
}
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));
+ 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);
/* determine and send the element count */
count = array_data.fixed_size;
if (count == 0) {
- count = array_data.dynamic_size(state,data);
+ 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));
} else {
for (cpt=0; cpt<count; cpt++) {
- TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, ptr, detect_cycle || sub_type->cycle));
+ TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, ptr,
+ detect_cycle || sub_type->cycle));
ptr += elm_size;
}
}
*
*/
xbt_error_t gras_datadesc_send(gras_socket_t sock,
- gras_datadesc_type_t type,
- void *src) {
+ 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);
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));
- xbt_free(ptr);
+ free(ptr);
}
break;
r_arch,NULL,0,
field_data,-1,
detect_cycle || sub_type->cycle));
+
+ if (field->recv)
+ field->recv(type,state,(void*)l_data);
+
}
VERB1("<< Received all fields of the structure %s", type->name);
TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type,
r_arch,NULL,0,
- l_data,-1,
+ l_data,-1,
detect_cycle || sub_type->cycle));
+ if (field->recv)
+ field->recv(type,state,l_data);
+
break;
}
VERB1("Not receiving data remotely referenced @%p since it's NULL",
*(void **)r_ref);
*(void**)l_data = NULL;
- xbt_free(r_ref);
+ free(r_ref);
break;
}
TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type,
r_arch,r_ref,pointer_type->size[r_arch],
- (char*)l_referenced, subsubcount,
+ (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 {
return errcode;
}
- xbt_free(r_ref);
+ free(r_ref);
break;
}
sub_type->size[r_arch] * count));
if (r_arch != GRAS_THISARCH)
TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data));
- xbt_free(ptr);
+ free(ptr);
}
} else if (sub_type->category_code == e_gras_datadesc_type_cat_array &&
sub_type->category.array_data.fixed_size > 0 &&
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));
- xbt_free(ptr);
+ free(ptr);
}
TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type,
r_arch, NULL, 0, ptr,-1,
detect_cycle || sub_type->cycle));
+
ptr += elm_size;
}
}
}
if (type->recv)
- type->recv(state,l_data);
+ type->recv(type,state,l_data);
return no_error;
}
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,
sub_type = field->type;
- xbt_assert0(!field->pre, "Callbacks not implemented in IDL compiler");
+ xbt_assert0(!field->send, "Callbacks not implemented in IDL compiler");
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));
+ 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]);
- xbt_assert0(!field->post, "Callbacks not implemented in IDL compiler");
+ xbt_assert0(!field->recv, "Callbacks not implemented in IDL compiler");
}
printf(" VERB1(\"<< Sent all fields of the structure %s\"", type->name);
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_gen_send_rec(sock,state,refs, sub_type, data, detect_cycle || sub_type->cycle));
-
- 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;
}
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));
+ 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)", (void*)*ref);
} else {
for (cpt=0; cpt<count; cpt++) {
- TRY(gras_datadesc_gen_send_rec(sock,state,refs, sub_type, ptr, detect_cycle || sub_type->cycle));
+ TRY(gras_datadesc_gen_send_rec(sock,state,refs, sub_type, ptr,
+ detect_cycle || sub_type->cycle));
ptr += elm_size;
}
}
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, type->cycle);
+ errcode = gras_datadesc_gen_send_rec(sock,state,refs,type,(char*)src,
+ detect_cycle || sub_type->cycle);
printf("}\n");
xbt_dict_free(&refs);
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));
- xbt_free(ptr);
+ free(ptr);
}
break;
TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type,
r_arch,NULL,0,
- field_data,-1,
+ 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);
TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type,
r_arch,NULL,0,
- l_data,-1,
+ l_data,-1,
detect_cycle || sub_type->cycle));
+ if (field->recv)
+ field->recv(type,state,data);
+
break;
}
VERB1("Not receiving data remotely referenced @%p since it's NULL",
*(void **)r_ref);
*(void**)l_data = NULL;
- xbt_free(r_ref);
+ free(r_ref);
break;
}
TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type,
r_arch,r_ref,pointer_type->size[r_arch],
- (char*)l_referenced, subsubcount,
+ (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 {
return errcode;
}
- xbt_free(r_ref);
+ free(r_ref);
break;
}
sub_type->size[r_arch] * count));
if (r_arch != GRAS_THISARCH)
TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data));
- xbt_free(ptr);
+ free(ptr);
}
} else if (sub_type->category_code == e_gras_datadesc_type_cat_array &&
sub_type->category.array_data.fixed_size > 0 &&
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));
- xbt_free(ptr);
+ free(ptr);
}
TRY(gras_datadesc_gen_recv_rec(sock,state,refs, sub_type,
r_arch, NULL, 0, ptr,-1,
detect_cycle || sub_type->cycle));
+
ptr += elm_size;
}
}
}
if (type->recv)
- type->recv(state,l_data);
+ type->recv(type,state,l_data);
return no_error;
}
errcode = gras_datadesc_gen_recv_rec(sock, state, refs, type,
r_arch, NULL, 0,
(char *) dst,-1,
- type->cycle);
+ sub_type->cycle);
printf("}\n");
xbt_dict_free(&refs);
