From c81afe1eb5f916d8452120c6a4467b5d1740b510 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 13 Feb 2014 13:40:18 +0100 Subject: [PATCH] Allow receives to be posted before send in smpi tracing. --- src/smpi/instr_smpi.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/smpi/instr_smpi.c b/src/smpi/instr_smpi.c index ad70cf91bc..a097ed6dbf 100644 --- a/src/smpi/instr_smpi.c +++ b/src/smpi/instr_smpi.c @@ -79,16 +79,28 @@ static char *smpi_container(int rank, char *container, int n) return container; } +static char *TRACE_smpi_get_key(int src, int dst, char *key, int n); + + static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) { //get the dynar for src#dst char aux[INSTR_DEFAULT_STR_SIZE]; snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); xbt_dynar_t d = xbt_dict_get_or_null(keys, aux); + + + if(!xbt_dynar_is_empty(d)){ + //receive was already pushed, perform a get instead + TRACE_smpi_get_key(src , dst, key ,n); + return key; + } + if (d == NULL) { d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); xbt_dict_set(keys, aux, d, NULL); } + //generate the key static unsigned long long counter = 0; @@ -107,8 +119,15 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n) snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); xbt_dynar_t d = xbt_dict_get_or_null(keys, aux); - xbt_assert(!xbt_dynar_is_empty(d), - "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__); + // xbt_assert(!xbt_dynar_is_empty(d), + // "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__); + + // sometimes the receive may be posted before the send + if(xbt_dynar_is_empty(d)){ + TRACE_smpi_put_key(src, dst, key, n); + return key; + } + char *s = xbt_dynar_get_as (d, 0, char *); snprintf (key, n, "%s", s); xbt_dynar_remove_at (d, 0, NULL); -- 2.20.1