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 0d1f510..c5dceca 100644 (file)
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -61,6 +61,7 @@ void TRACE_smpi_start (void)
 
 void TRACE_smpi_end (void)
 {
+  TRACE_msg_clean ();
   if (IS_TRACING_SMPI){
     TRACE_end();
   }
@@ -103,8 +104,28 @@ void TRACE_smpi_collective_out (int rank, int root, const char *operation)
       _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",
@@ -113,6 +134,8 @@ void TRACE_smpi_send (int rank, int src, int dst)
 
 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",