trace MPI_Init and MPI_Finalize as well

diff --git a/src/smpi/instr_smpi.c b/src/smpi/instr_smpi.c
index 527c0f0..283e84d 100644 (file)
--- a/src/smpi/instr_smpi.c
+++ b/src/smpi/instr_smpi.c
@@ -41,6 +41,8 @@ static const char *smpi_colors[] ={
     "scatterv",      "0.52 0 0.52",
     "scatter",       "1 0.74 0.54",
     "computing",     "0 1 1",
     "scatterv",      "0.52 0 0.52",
     "scatter",       "1 0.74 0.54",
     "computing",     "0 1 1",

+    "init",       "0 1 0",
+    "finalize",     "0 1 0",

     NULL, NULL,
 };
 
     NULL, NULL,
 };
 

diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c
index 3a3b67e..7f06648 100644 (file)
--- a/src/smpi/smpi_pmpi.c
+++ b/src/smpi/smpi_pmpi.c
@@ -31,8 +31,9 @@ int PMPI_Init(int *argc, char ***argv)
 #ifdef HAVE_TRACING
   int rank = smpi_process_index();
   TRACE_smpi_init(rank);
 #ifdef HAVE_TRACING
   int rank = smpi_process_index();
   TRACE_smpi_init(rank);

-

   TRACE_smpi_computing_init(rank);
   TRACE_smpi_computing_init(rank);

+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__,0);
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);

 #endif
   smpi_bench_begin();
   return MPI_SUCCESS;
 #endif
   smpi_bench_begin();
   return MPI_SUCCESS;


@@ -40,11 +41,14 @@ int PMPI_Init(int *argc, char ***argv)
 
 int PMPI_Finalize(void)
 {
 
 int PMPI_Finalize(void)
 {

-  smpi_process_finalize();

   smpi_bench_end();
 #ifdef HAVE_TRACING
   int rank = smpi_process_index();
   smpi_bench_end();
 #ifdef HAVE_TRACING
   int rank = smpi_process_index();

-  TRACE_smpi_computing_out(rank);
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__,0);
+#endif
+  smpi_process_finalize();
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);

   TRACE_smpi_finalize(smpi_process_index());
 #endif
   smpi_process_destroy();
   TRACE_smpi_finalize(smpi_process_index());
 #endif
   smpi_process_destroy();