From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Fri, 25 Oct 2013 09:06:34 +0000 (+0200)
Subject: trace MPI_Init and MPI_Finalize as well
X-Git-Tag: v3_10_rc1~45
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2c3da798b790ca00b79a6131e1701c4a60fbe5f1

trace MPI_Init and MPI_Finalize as well
---

diff --git a/src/smpi/instr_smpi.c b/src/smpi/instr_smpi.c
index 527c0f0991..283e84d1c4 100644
--- 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",
+    "init",       "0 1 0",
+    "finalize",     "0 1 0",
     NULL, NULL,
 };
 
diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c
index 3a3b67ea06..7f06648848 100644
--- 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);
-
   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;
@@ -40,11 +41,14 @@ int PMPI_Init(int *argc, char ***argv)
 
 int PMPI_Finalize(void)
 {
-  smpi_process_finalize();
   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();