X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87468a9f6b682ee41edc3a16a100554ef48032c9..07c48b840765e90ae60a3c7f2d3ee466ed0a64b2:/src/gras/DataDesc/ddt_exchange.c diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index 6519ec0ecc..effcd84d65 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -13,7 +13,7 @@ #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", @@ -122,8 +122,8 @@ gras_datadesc_copy_rec(gras_cbps_t state, 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); } @@ -157,6 +157,22 @@ gras_datadesc_copy_rec(gras_cbps_t state, VERB1("Copy field %s",field->name); count += gras_datadesc_copy_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_debug)) { + if (sub_type == gras_datadesc_by_name("unsigned int")) { + DEBUG2("Copied value for field %s: %d (type: unsigned int)",field->name, *(unsigned int*)field_dst); + } else if (sub_type == gras_datadesc_by_name("int")) { + DEBUG2("Copied value for field %s: %d (type: int)",field->name, *(int*)field_dst); + + } else if (sub_type == gras_datadesc_by_name("unsigned long int")) { + DEBUG2("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")) { + DEBUG2("Copied value for field %s: %ld (type: long int)",field->name, *(long int*)field_dst); + + } else if (sub_type == gras_datadesc_by_name("string")) { + DEBUG2("Copied value for field %s: '%s' (type: string)", field->name, *(char**)field_dst); + } + } } VERB1("<< Copied all fields of the structure %s", type->name); @@ -287,7 +303,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 count; + long int array_count; char *src_ptr=src; char *dst_ptr=dst; long int elm_size; @@ -295,12 +311,12 @@ gras_datadesc_copy_rec(gras_cbps_t state, array_data = type->category.array_data; /* determine and send the element count */ - count = array_data.fixed_size; - if (count == 0) - count = subsize; - if (count == 0) { - count = array_data.dynamic_size(type,state,src); - xbt_assert1(count >=0, + array_count = array_data.fixed_size; + if (array_count == 0) + array_count = subsize; + if (array_count == 0) { + array_count = array_data.dynamic_size(type,state,src); + xbt_assert1(array_count >=0, "Invalid (negative) array size for type %s",type->name); } @@ -308,21 +324,24 @@ gras_datadesc_copy_rec(gras_cbps_t state, 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, copy it in one shot",count); - memcpy(dst, src, sub_type->aligned_size[GRAS_THISARCH] * count); - count += sub_type->aligned_size[GRAS_THISARCH] * count; + VERB1("Array of %ld scalars, copy it in one shot",array_count); + memcpy(dst, src, sub_type->aligned_size[GRAS_THISARCH] * array_count); + count += sub_type->aligned_size[GRAS_THISARCH] * array_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, copy it in one shot",count); + VERB1("Array of %ld fixed array of scalars, copy it in one shot", + array_count); memcpy(dst,src,sub_type->category.array_data.type->aligned_size[GRAS_THISARCH] - * count * sub_type->category.array_data.fixed_size); + * array_count * sub_type->category.array_data.fixed_size); count += sub_type->category.array_data.type->aligned_size[GRAS_THISARCH] - * count * sub_type->category.array_data.fixed_size; + * array_count * sub_type->category.array_data.fixed_size; } else { - for (cpt=0; cptcycle); src_ptr += elm_size; @@ -335,6 +354,7 @@ gras_datadesc_copy_rec(gras_cbps_t state, default: xbt_assert0(0, "Invalid type"); } + return count; } /** @@ -387,8 +407,12 @@ gras_datadesc_send_rec(gras_socket_t sock, VERB2("Send a %s (%s)", type->name, gras_datadesc_cat_names[type->category_code]); + if (!strcmp(type->name,"string")) + VERB1("value: '%s'",*(char**)data); + if (type->send) { type->send(type,state,data); + DEBUG0("Run the emission callback"); } switch (type->category_code) { @@ -412,8 +436,10 @@ gras_datadesc_send_rec(gras_socket_t sock, sub_type = field->type; - if (field->send) + if (field->send) { + DEBUG1("Run the emission callback of field %s", field->name); field->send(type,state,field_data); + } VERB1("Send field %s",field->name); gras_datadesc_send_rec(sock,state,refs,sub_type, field_data, @@ -473,7 +499,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, &(sub_type->code),1 /*stable*/); + gras_dd_send_int(sock, (int*) &(sub_type->code),1 /*stable*/); } /* Send the actual value of the pointer for cycle handling */ @@ -580,19 +606,20 @@ void gras_datadesc_send(gras_socket_t sock, void *src) { xbt_ex_t e; - gras_cbps_t state; + static gras_cbps_t state=NULL; xbt_dict_t refs; /* all references already sent */ xbt_assert0(type,"called with NULL type descriptor"); refs = xbt_dict_new(); - state = gras_cbps_new(); + if (!state) + state = gras_cbps_new(); TRY { gras_datadesc_send_rec(sock,state,refs,type,(char*)src, type->cycle); } CLEANUP { xbt_dict_free(&refs); - gras_cbps_free(&state); + gras_cbps_reset(state); } CATCH(e) { RETHROW; } @@ -665,8 +692,10 @@ gras_datadesc_recv_rec(gras_socket_t sock, field_data,-1, detect_cycle || sub_type->cycle); - if (field->recv) + if (field->recv) { + DEBUG1("Run the reception callback of field %s", field->name); field->recv(type,state,(void*)l_data); + } } VERB1("<< Received all fields of the structure %s", type->name); @@ -893,6 +922,9 @@ gras_datadesc_recv_rec(gras_socket_t sock, if (type->recv) type->recv(type,state,l_data); + if (!strcmp(type->name,"string")) + VERB1("value: '%s'",*(char**)l_data); + } /** @@ -909,11 +941,12 @@ gras_datadesc_recv(gras_socket_t sock, void *dst) { xbt_ex_t e; - gras_cbps_t state; /* callback persistent state */ + static gras_cbps_t state=NULL; /* callback persistent state */ xbt_dict_t refs; /* all references already sent */ refs = xbt_dict_new(); - state = gras_cbps_new(); + if (!state) + state = gras_cbps_new(); xbt_assert0(type,"called with NULL type descriptor"); TRY { @@ -923,7 +956,7 @@ gras_datadesc_recv(gras_socket_t sock, type->cycle); } CLEANUP { xbt_dict_free(&refs); - gras_cbps_free(&state); + gras_cbps_reset(state); } CATCH(e) { RETHROW; }