properly destroying containers at the end of trace file

[simgrid.git] / src / instr / smpi_instr.c

diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c
index f9056e8..c5dceca 100644 (file)
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -8,6 +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){
@@ -17,6 +61,7 @@ void TRACE_smpi_start (void)
 
 void TRACE_smpi_end (void)
 {
+  TRACE_msg_clean ();
   if (IS_TRACING_SMPI){
     TRACE_end();
   }
@@ -25,16 +70,76 @@ void TRACE_smpi_end (void)
 void TRACE_smpi_init (int rank)
 {
   if (!IS_TRACING_SMPI) return;
-  //double time = SIMIX_get_clock();
-  //smx_host_t host = SIMIX_host_self();
+
+  char str[100];
+  _TRACE_smpi_container (rank, str, 100);
+  pajeCreateContainer (SIMIX_get_clock(), str, "MPI_PROCESS",
+      SIMIX_host_get_name(SIMIX_host_self()), str);
 }
 
 void TRACE_smpi_finalize (int rank)
 {
   if (!IS_TRACING_SMPI) return;
-  //double time = SIMIX_get_clock();
-  //smx_host_t host = SIMIX_host_self();
+
+  char str[100];
+  pajeDestroyContainer (SIMIX_get_clock(), "MPI_PROCESS",
+      _TRACE_smpi_container (rank, str, 100));
+}
+
+void TRACE_smpi_collective_in (int rank, int root, const char *operation)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  char str[100];
+  pajePushState (SIMIX_get_clock(), "MPI_STATE",
+      _TRACE_smpi_container (rank, str, 100), operation);
 }
 
+void TRACE_smpi_collective_out (int rank, int root, const char *operation)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  char str[100];
+  pajePopState (SIMIX_get_clock(), "MPI_STATE",
+      _TRACE_smpi_container (rank, str, 100));
+}
+
+void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  char str[100];
+  pajePushState (SIMIX_get_clock(), "MPI_STATE",
+      _TRACE_smpi_container (rank, str, 100), operation);
+}
+
+void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  char str[100];
+  pajePopState (SIMIX_get_clock(), "MPI_STATE",
+      _TRACE_smpi_container (rank, str, 100));
+}
+
+void TRACE_smpi_send (int rank, int src, int dst)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  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);
+}
+
+void TRACE_smpi_recv (int rank, int src, int dst)
+{
+  if (!IS_TRACING_SMPI) return;
+
+  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);
+}
 #endif