From e0b9d36c291764ef931ce9a23db0d95caf23c045 Mon Sep 17 00:00:00 2001 From: schnorr Date: Fri, 6 Aug 2010 15:39:02 +0000 Subject: [PATCH] trace: a dictionary to keep link keys, put and get functions to manage it git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8127 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/instr/interface.c | 1 + src/instr/private.h | 1 + src/instr/smpi_instr.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/src/instr/interface.c b/src/instr/interface.c index 849986e24c..fc0b886651 100644 --- a/src/instr/interface.c +++ b/src/instr/interface.c @@ -89,6 +89,7 @@ int TRACE_start () __TRACE_msg_init(); __TRACE_surf_init(); __TRACE_msg_process_init (); + __TRACE_smpi_init (); return 0; } diff --git a/src/instr/private.h b/src/instr/private.h index 5006ad1cc7..a5da3bb02a 100644 --- a/src/instr/private.h +++ b/src/instr/private.h @@ -130,6 +130,7 @@ int TRACE_surf_gtnets_get_dst (void *action); void TRACE_surf_gtnets_destroy (void *action); /* from smpi_instr.c */ +void __TRACE_smpi_init (void); void TRACE_smpi_init (int rank); void TRACE_smpi_finalize (int rank); void TRACE_smpi_start (void); diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c index e9ae4dff4c..77008778a2 100644 --- a/src/instr/smpi_instr.c +++ b/src/instr/smpi_instr.c @@ -8,12 +8,50 @@ #ifdef HAVE_TRACING +static xbt_dict_t keys; + static char *_TRACE_smpi_container (int rank, char *container, int n) { snprintf (container, n, "rank-%d", rank); return container; } +static char *_TRACE_smpi_put_key (int src, int dst, char *key, int n) +{ + //get the dynar for src#dst + char aux[100]; + snprintf (aux, 100, "%d#%d", src, dst); + xbt_dynar_t d = xbt_dict_get_or_null (keys, aux); + if (d == NULL){ + d = xbt_dynar_new (sizeof(char*), xbt_free); + xbt_dict_set (keys, aux, d, xbt_free); + } + //generate the key + static long long counter = 0; + snprintf (key, n, "%d%d%lld", src, dst, counter++); + + xbt_dynar_insert_at (d, 0, xbt_strdup (key)); + return key; +} + +static char *_TRACE_smpi_get_key (int src, int dst, char *key, int n) +{ + char aux[100]; + snprintf (aux, 100, "%d#%d", src, dst); + xbt_dynar_t d = xbt_dict_get_or_null (keys, aux); + + int length = xbt_dynar_length (d); + char stored_key[n]; + xbt_dynar_remove_at (d, length-1, stored_key); + strncpy (key, stored_key, n); + return key; +} + +void __TRACE_smpi_init () +{ + keys = xbt_dict_new(); +} + void TRACE_smpi_start (void) { if (IS_TRACING_SMPI){ -- 2.20.1