X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12a9f3c05daaf0c979b9227bec595d5b12666d31..2a1f1d17620dc6fff28292e37791e40d77eba401:/src/gras/DataDesc/ddt_exchange.c diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index 49f0879fae..9ecb3008f7 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -13,49 +13,49 @@ #include "gras/DataDesc/datadesc_private.h" #include "gras/Transport/transport_interface.h" /* gras_trp_send/recv */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_exchange,datadesc, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_exchange,gras_ddt, "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 uint_type = NULL; static gras_datadesc_type_t pointer_type = NULL; -static _XBT_INLINE void -gras_dd_send_int(gras_socket_t sock,int *i, int stable) { +static XBT_INLINE void +gras_dd_send_uint(gras_socket_t sock,unsigned int *i, int stable) { - if (!int_type) { - int_type = gras_datadesc_by_name("int"); - xbt_assert(int_type); + if (!uint_type) { + uint_type = gras_datadesc_by_name("unsigned int"); + xbt_assert(uint_type); } - DEBUG1("send_int(%d)",*i); - gras_trp_send(sock, (char*)i, int_type->size[GRAS_THISARCH], stable); + DEBUG1("send_uint(%u)",*i); + gras_trp_send(sock, (char*)i, uint_type->size[GRAS_THISARCH], stable); } -static _XBT_INLINE void -gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) { +static XBT_INLINE void +gras_dd_recv_uint(gras_socket_t sock, int r_arch, unsigned int *i) { - if (!int_type) { - int_type = gras_datadesc_by_name("int"); - xbt_assert(int_type); + if (!uint_type) { + uint_type = gras_datadesc_by_name("unsigned int"); + xbt_assert(uint_type); } - if (int_type->size[GRAS_THISARCH] >= int_type->size[r_arch]) { - gras_trp_recv(sock, (char*)i, int_type->size[r_arch]); + if (uint_type->size[GRAS_THISARCH] >= uint_type->size[r_arch]) { + gras_trp_recv(sock, (char*)i, uint_type->size[r_arch]); if (r_arch != GRAS_THISARCH) - gras_dd_convert_elm(int_type,1,r_arch, i,i); + gras_dd_convert_elm(uint_type,1,r_arch, i,i); } else { - void *ptr = xbt_malloc(int_type->size[r_arch]); + void *ptr = xbt_malloc(uint_type->size[r_arch]); - gras_trp_recv(sock, (char*)ptr, int_type->size[r_arch]); + gras_trp_recv(sock, (char*)ptr, uint_type->size[r_arch]); if (r_arch != GRAS_THISARCH) - gras_dd_convert_elm(int_type,1,r_arch, ptr,i); + gras_dd_convert_elm(uint_type,1,r_arch, ptr,i); free(ptr); } - DEBUG1("recv_int(%d)",*i); + DEBUG1("recv_uint(%u)",*i); } /* @@ -63,7 +63,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 _XBT_INLINE int +static XBT_INLINE int gras_dd_is_r_null(char **r_ptr, long int length) { int i; @@ -76,7 +76,7 @@ gras_dd_is_r_null(char **r_ptr, long int length) { return 1; } -static _XBT_INLINE void +static XBT_INLINE void gras_dd_alloc_ref(xbt_dict_t refs, long int size, char **r_ref, @@ -95,18 +95,17 @@ gras_dd_alloc_ref(xbt_dict_t refs, 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 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, free); + xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, xbt_free_f); } } static int -gras_datadesc_copy_rec(gras_cbps_t state, +gras_datadesc_memcpy_rec(gras_cbps_t state, xbt_dict_t refs, gras_datadesc_type_t type, char *src, @@ -116,14 +115,14 @@ gras_datadesc_copy_rec(gras_cbps_t state, xbt_ex_t e; - int cpt; + unsigned int cpt; gras_datadesc_type_t sub_type; /* type on which we recurse */ int count = 0; VERB4("Copy a %s (%s) from %p to %p", type->name, gras_datadesc_cat_names[type->category_code], - src,dst); - + src,dst); + if (type->send) { type->send(type,state,src); } @@ -154,9 +153,27 @@ gras_datadesc_copy_rec(gras_cbps_t state, if (field->send) field->send(type,state,field_src); - VERB1("Copy field %s",field->name); - count += gras_datadesc_copy_rec(state,refs,sub_type, field_src, field_dst, 0, + DEBUG1("Copy field %s",field->name); + count += gras_datadesc_memcpy_rec(state,refs,sub_type, field_src, field_dst, 0, detect_cycle || sub_type->cycle); + + if (XBT_LOG_ISENABLED(gras_ddt_exchange,xbt_log_priority_verbose)) { + if (sub_type == gras_datadesc_by_name("unsigned int")) { + VERB2("Copied value for field '%s': %d (type: unsigned int)",field->name, *(unsigned int*)field_dst); + } else if (sub_type == gras_datadesc_by_name("int")) { + VERB2("Copied value for field '%s': %d (type: int)",field->name, *(int*)field_dst); + + } else if (sub_type == gras_datadesc_by_name("unsigned long int")) { + VERB2("Copied value for field '%s': %ld (type: unsigned long int)",field->name, *(unsigned long int*)field_dst); + } else if (sub_type == gras_datadesc_by_name("long int")) { + VERB2("Copied value for field '%s': %ld (type: long int)",field->name, *(long int*)field_dst); + + } else if (sub_type == gras_datadesc_by_name("string")) { + VERB2("Copied value for field '%s': '%s' (type: string)", field->name, *(char**)field_dst); + } else { + VERB1("Copied a value for field '%s' (type not scalar?)", field->name); + } + } } VERB1("<< Copied all fields of the structure %s", type->name); @@ -167,7 +184,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, case e_gras_datadesc_type_cat_union: { gras_dd_cat_union_t union_data; gras_dd_cat_field_t field=NULL; - int field_num; + unsigned int field_num; union_data = type->category.union_data; @@ -192,7 +209,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, if (field->send) field->send(type,state,src); - count += gras_datadesc_copy_rec(state,refs, sub_type, src, dst,0, + count += gras_datadesc_memcpy_rec(state,refs, sub_type, src, dst,0, detect_cycle || sub_type->cycle); break; @@ -222,11 +239,12 @@ gras_datadesc_copy_rec(gras_cbps_t state, reference_is_to_cpy = 0; TRY { - if (detect_cycle) + if (detect_cycle) { /* return ignored. Just checking whether it's known or not */ n_ref=xbt_dict_get_ext(refs,(char*)o_ref, sizeof(char*)); - else + } else { reference_is_to_cpy = 1; + } } CATCH(e) { if (e.category != not_found_error) RETHROW; @@ -267,7 +285,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, detect_cycle); } - count += gras_datadesc_copy_rec(state,refs, sub_type, + count += gras_datadesc_memcpy_rec(state,refs, sub_type, *o_ref,(char*)l_referenced, subsubcount, detect_cycle || sub_type->cycle); @@ -287,7 +305,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, case e_gras_datadesc_type_cat_array: { gras_dd_cat_array_t array_data; - long int array_count; + unsigned long int array_count; char *src_ptr=src; char *dst_ptr=dst; long int elm_size; @@ -326,7 +344,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, VERB1("Array of %ld stuff, copy it in one after the other",array_count); for (cpt=0; cptcycle); src_ptr += elm_size; dst_ptr += elm_size; @@ -338,33 +356,36 @@ gras_datadesc_copy_rec(gras_cbps_t state, default: xbt_assert0(0, "Invalid type"); } + return count; } /** - * gras_datadesc_copy: + * gras_datadesc_memcpy: * * Copy the data pointed by src and described by type * to a new location, and store a pointer to it in dst. * */ -int gras_datadesc_copy(gras_datadesc_type_t type, +int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst) { xbt_ex_t e; - gras_cbps_t state; - xbt_dict_t refs; /* all references already sent */ + static gras_cbps_t state=NULL; + static xbt_dict_t refs=NULL; /* all references already sent */ int size=0; xbt_assert0(type,"called with NULL type descriptor"); - refs = xbt_dict_new(); - state = gras_cbps_new(); + if (!state) { + state = gras_cbps_new(); + refs = xbt_dict_new(); + } TRY { - size = gras_datadesc_copy_rec(state,refs,type,(char*)src,(char*)dst,0, - type->cycle); + size = gras_datadesc_memcpy_rec(state,refs,type,(char*)src,(char*)dst,0, + type->cycle); } CLEANUP { - xbt_dict_free(&refs); - gras_cbps_free(&state); + xbt_dict_reset(refs); + gras_cbps_reset(state); } CATCH(e) { RETHROW; } @@ -384,7 +405,7 @@ gras_datadesc_send_rec(gras_socket_t sock, int detect_cycle) { xbt_ex_t e; - int cpt; + unsigned int cpt; gras_datadesc_type_t sub_type; /* type on which we recurse */ VERB2("Send a %s (%s)", @@ -437,7 +458,7 @@ 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=NULL; - int field_num; + unsigned int field_num; union_data = type->category.union_data; @@ -456,7 +477,7 @@ gras_datadesc_send_rec(gras_socket_t sock, type->name, field_num, xbt_dynar_length(union_data.fields)); /* Send the field number */ - gras_dd_send_int(sock, &field_num, 0 /* not stable */); + gras_dd_send_uint(sock, &field_num, 0 /* not stable */); /* Send the content */ field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t); @@ -482,7 +503,7 @@ gras_datadesc_send_rec(gras_socket_t sock, sub_type = ref_data.type; if (sub_type == NULL) { sub_type = (*ref_data.selector)(type,state,data); - gras_dd_send_int(sock, (int*) &(sub_type->code),1 /*stable*/); + gras_dd_send_uint(sock, &(sub_type->code),1 /*stable*/); } /* Send the actual value of the pointer for cycle handling */ @@ -530,7 +551,7 @@ gras_datadesc_send_rec(gras_socket_t sock, case e_gras_datadesc_type_cat_array: { gras_dd_cat_array_t array_data; - int count; + unsigned int count; char *ptr=data; long int elm_size; @@ -542,7 +563,7 @@ gras_datadesc_send_rec(gras_socket_t sock, count = array_data.dynamic_size(type,state,data); xbt_assert1(count >=0, "Invalid (negative) array size for type %s",type->name); - gras_dd_send_int(sock, &count, 0/*non-stable*/); + gras_dd_send_uint(sock, &count, 0/*non-stable*/); } /* send the content */ @@ -590,18 +611,19 @@ void gras_datadesc_send(gras_socket_t sock, xbt_ex_t e; static gras_cbps_t state=NULL; - xbt_dict_t refs; /* all references already sent */ + static xbt_dict_t refs=NULL; /* all references already sent */ xbt_assert0(type,"called with NULL type descriptor"); - refs = xbt_dict_new(); - if (!state) + if (!state) { state = gras_cbps_new(); - + refs = xbt_dict_new(); + } + TRY { gras_datadesc_send_rec(sock,state,refs,type,(char*)src, type->cycle); } CLEANUP { - xbt_dict_free(&refs); + xbt_dict_reset(refs); gras_cbps_reset(state); } CATCH(e) { RETHROW; @@ -632,7 +654,7 @@ gras_datadesc_recv_rec(gras_socket_t sock, int subsize, int detect_cycle) { - int cpt; + unsigned int cpt; gras_datadesc_type_t sub_type; xbt_ex_t e; @@ -689,7 +711,7 @@ 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; + unsigned int field_num; union_data = type->category.union_data; @@ -697,7 +719,7 @@ gras_datadesc_recv_rec(gras_socket_t sock, "Please call gras_datadesc_declare_union_close on %s before receiving it", type->name); /* retrieve the field number */ - gras_dd_recv_int(sock, r_arch, &field_num); + gras_dd_recv_uint(sock, r_arch, &field_num); if (field_num < 0) THROW1(mismatch_error,0, "Received union field for %s is negative", type->name); @@ -731,8 +753,8 @@ gras_datadesc_recv_rec(gras_socket_t sock, /* Get the referenced type locally or from peer */ sub_type = ref_data.type; if (sub_type == NULL) { - int ref_code; - gras_dd_recv_int(sock, r_arch, &ref_code); + unsigned int ref_code; + gras_dd_recv_uint(sock, r_arch, &ref_code); sub_type = gras_datadesc_by_id(ref_code); } @@ -758,18 +780,20 @@ gras_datadesc_recv_rec(gras_socket_t sock, reference_is_to_recv = 0; TRY { - if (detect_cycle) + if (detect_cycle) { l_ref = xbt_dict_get_ext(refs, (char*)r_ref, pointer_type->size[r_arch]); - else + } else { reference_is_to_recv = 1; + } } CATCH(e) { if (e.category != not_found_error) RETHROW; reference_is_to_recv = 1; xbt_ex_free(e); } + if (reference_is_to_recv) { - int subsubcount = 0; + unsigned int subsubcount = 0; void *l_referenced=NULL; VERB2("Receiving a ref to '%s', remotely @%p", @@ -782,7 +806,7 @@ gras_datadesc_recv_rec(gras_socket_t sock, subsubcount = array_data.fixed_size; if (subsubcount == 0) - gras_dd_recv_int(sock, r_arch, &subsubcount); + gras_dd_recv_uint(sock, r_arch, &subsubcount); subsub_type = array_data.type; @@ -821,7 +845,7 @@ gras_datadesc_recv_rec(gras_socket_t sock, case e_gras_datadesc_type_cat_array: { gras_dd_cat_array_t array_data; - int count; + unsigned int count; char *ptr; long int elm_size; @@ -831,7 +855,7 @@ gras_datadesc_recv_rec(gras_socket_t sock, if (count == 0) count = subsize; if (count == 0) - gras_dd_recv_int(sock, r_arch, &count); + gras_dd_recv_uint(sock, r_arch, &count); if (count == 0) THROW1(mismatch_error,0, "Invalid (=0) array size for type %s",type->name); @@ -925,12 +949,13 @@ gras_datadesc_recv(gras_socket_t sock, xbt_ex_t e; static gras_cbps_t state=NULL; /* callback persistent state */ - xbt_dict_t refs; /* all references already sent */ + static xbt_dict_t refs=NULL; /* all references already sent */ - refs = xbt_dict_new(); - if (!state) + if (!state) { state = gras_cbps_new(); - + refs = xbt_dict_new(); + } + xbt_assert0(type,"called with NULL type descriptor"); TRY { gras_datadesc_recv_rec(sock, state, refs, type, @@ -938,7 +963,7 @@ gras_datadesc_recv(gras_socket_t sock, (char *) dst,-1, type->cycle); } CLEANUP { - xbt_dict_free(&refs); + xbt_dict_reset(refs); gras_cbps_reset(state); } CATCH(e) { RETHROW;