X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6773dd132c1a2f71d81c734ddfaf21fe900a1cb3..eb5a9c33c0c791e1c90c4c99db33460a074107a2:/src/instr/smpi_instr.c

diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c
index a53d3a2bda..4eac5a005b 100644
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -10,131 +10,146 @@
 
 static xbt_dict_t keys;
 
-static char *_TRACE_smpi_container (int rank, char *container, int n)
+static char *TRACE_smpi_container(int rank, char *container, int n)
 {
-  snprintf (container, n, "rank-%d", rank);
+  snprintf(container, n, "rank-%d", rank);
   return container;
 }
 
-static char *_TRACE_smpi_put_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[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);
+  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 (d == NULL) {
+    d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+    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++);
+  static unsigned long long counter = 0;
+  snprintf(key, n, "%d%d%lld", src, dst, counter++);
+
+  //push it
+  char *a = (char*)xbt_strdup(key);
+  xbt_dynar_push_as(d, char *, a);
 
-  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)
+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);
+  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);
+
+  int length = xbt_dynar_length(d);
+  char *s = xbt_dynar_get_as (d, length-1, char *);
+  snprintf (key, n, "%s", s);
+  xbt_dynar_remove_at (d, length-1, NULL);
   return key;
 }
 
-void __TRACE_smpi_init ()
+void TRACE_smpi_alloc()
 {
   keys = xbt_dict_new();
 }
 
-void TRACE_smpi_start (void)
+void TRACE_smpi_start(void)
 {
-  if (IS_TRACING_SMPI){
-    TRACE_start ();
+  if (IS_TRACING_SMPI) {
+    TRACE_start();
   }
 }
 
-void TRACE_smpi_end (void)
+void TRACE_smpi_release(void)
 {
-  if (IS_TRACING_SMPI){
+  TRACE_surf_release();
+  if (IS_TRACING_SMPI) {
     TRACE_end();
   }
 }
 
-void TRACE_smpi_init (int rank)
+void TRACE_smpi_init(int rank)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  _TRACE_smpi_container (rank, str, 100);
-  pajeCreateContainer (SIMIX_get_clock(), str, "MPI_PROCESS",
-      SIMIX_host_get_name(SIMIX_host_self()), str);
+  char str[INSTR_DEFAULT_STR_SIZE];
+  TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  pajeCreateContainer(SIMIX_get_clock(), str, "MPI_PROCESS",
+                      SIMIX_host_get_name(SIMIX_host_self()), str);
 }
 
-void TRACE_smpi_finalize (int rank)
+void TRACE_smpi_finalize(int rank)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  pajeDestroyContainer (SIMIX_get_clock(), "MPI_PROCESS",
-      _TRACE_smpi_container (rank, str, 100));
+  char str[INSTR_DEFAULT_STR_SIZE];
+  pajeDestroyContainer(SIMIX_get_clock(), "MPI_PROCESS",
+                       TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
 }
 
-void TRACE_smpi_collective_in (int rank, int root, const char *operation)
+void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+  char str[INSTR_DEFAULT_STR_SIZE];
+  pajePushState(SIMIX_get_clock(), "MPI_STATE",
+                TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE), operation);
 }
 
-void TRACE_smpi_collective_out (int rank, int root, const char *operation)
+void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+  char str[INSTR_DEFAULT_STR_SIZE];
+  pajePopState(SIMIX_get_clock(), "MPI_STATE",
+               TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
 }
 
-void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
+void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+  char str[INSTR_DEFAULT_STR_SIZE];
+  pajePushState(SIMIX_get_clock(), "MPI_STATE",
+                TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE), operation);
 }
 
-void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
+void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!IS_TRACING_SMPI) return;
+  if (!IS_TRACING_SMPI)
+    return;
 
-  char str[100];
-  pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+  char str[INSTR_DEFAULT_STR_SIZE];
+  pajePopState(SIMIX_get_clock(), "MPI_STATE",
+               TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
 }
 
-void TRACE_smpi_send (int rank, int src, int dst)
+void TRACE_smpi_send(int rank, int src, int dst)
 {
-  char key[100], str[100];
-  _TRACE_smpi_put_key (src, dst, key, 100);
-  pajeStartLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (src, str, 100), key);
+  if (!IS_TRACING_SMPI)
+    return;
+
+  char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
+  TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
+  pajeStartLink(SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
+                TRACE_smpi_container(src, str, INSTR_DEFAULT_STR_SIZE), key);
 }
 
-void TRACE_smpi_recv (int rank, int src, int dst)
+void TRACE_smpi_recv(int rank, int src, int dst)
 {
-  char key[100], str[100];
-  _TRACE_smpi_get_key (src, dst, key, 100);
-  pajeEndLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (dst, str, 100), key);
+  if (!IS_TRACING_SMPI)
+    return;
+
+  char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
+  TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
+  pajeEndLink(SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
+              TRACE_smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE), key);
 }
 #endif
-