#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",
static gras_datadesc_type_t int_type = NULL;
static gras_datadesc_type_t pointer_type = NULL;
-static _XBT_INLINE void
+static XBT_INLINE void
gras_dd_send_int(gras_socket_t sock,int *i, int stable) {
if (!int_type) {
gras_trp_send(sock, (char*)i, int_type->size[GRAS_THISARCH], stable);
}
-static _XBT_INLINE void
+static XBT_INLINE void
gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
if (!int_type) {
* 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;
return 1;
}
-static _XBT_INLINE void
+static XBT_INLINE void
gras_dd_alloc_ref(xbt_dict_t refs,
long int size,
char **r_ref,
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);
}
}
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);
}
if (field->send)
field->send(type,state,field_src);
- VERB1("Copy field %s",field->name);
+ DEBUG1("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_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);
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;
default:
xbt_assert0(0, "Invalid type");
}
+
return count;
}
/**
int gras_datadesc_copy(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);
} CLEANUP {
- xbt_dict_free(&refs);
- gras_cbps_free(&state);
+ xbt_dict_reset(refs);
+ gras_cbps_reset(state);
} CATCH(e) {
RETHROW;
}
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;
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;
void *l_referenced=NULL;
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,
(char *) dst,-1,
type->cycle);
} CLEANUP {
- xbt_dict_free(&refs);
+ xbt_dict_reset(refs);
gras_cbps_reset(state);
} CATCH(e) {
RETHROW;
