X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ca1291c2f63ca6235f4b4885c48413a900aade4..e566c09daba9ad67b31f3992da9172eb04b807a8:/src/gras/DataDesc/ddt_exchange.c diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index 8069511b51..60b19436e9 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -385,7 +385,6 @@ gras_datadesc_memcpy_rec(gras_cbps_t state, */ int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst) { - xbt_ex_t e; static gras_cbps_t state = NULL; static xbt_dict_t refs = NULL; /* all references already sent */ int size = 0; @@ -403,10 +402,12 @@ int gras_datadesc_memcpy(gras_datadesc_type_t type, void *src, void *dst) size = gras_datadesc_memcpy_rec(state, refs, type, (char *) src, (char *) dst, 0, type->cycle); - } TRY_CLEANUP { + } + TRY_CLEANUP { xbt_dict_reset(refs); gras_cbps_reset(state); - } CATCH(e) { + } + CATCH_ANONYMOUS { RETHROW; } return size; @@ -630,8 +631,6 @@ gras_datadesc_send_rec(gras_socket_t sock, void gras_datadesc_send(gras_socket_t sock, gras_datadesc_type_t type, void *src) { - - xbt_ex_t e; static gras_cbps_t state = NULL; static xbt_dict_t refs = NULL; /* all references already sent */ @@ -645,10 +644,12 @@ void gras_datadesc_send(gras_socket_t sock, TRY { gras_datadesc_send_rec(sock, state, refs, type, (char *) src, type->cycle); - } TRY_CLEANUP { + } + TRY_CLEANUP { xbt_dict_reset(refs); gras_cbps_reset(state); - } CATCH(e) { + } + CATCH_ANONYMOUS { RETHROW; } } @@ -970,8 +971,6 @@ void gras_datadesc_recv(gras_socket_t sock, gras_datadesc_type_t type, int r_arch, void *dst) { - - xbt_ex_t e; static gras_cbps_t state = NULL; /* callback persistent state */ static xbt_dict_t refs = NULL; /* all references already sent */ @@ -984,10 +983,12 @@ gras_datadesc_recv(gras_socket_t sock, TRY { gras_datadesc_recv_rec(sock, state, refs, type, r_arch, NULL, 0, (char *) dst, -1, type->cycle); - } TRY_CLEANUP { + } + TRY_CLEANUP { xbt_dict_reset(refs); gras_cbps_reset(state); - } CATCH(e) { + } + CATCH_ANONYMOUS { RETHROW; } }