Make SMPE's output to look more like clog2_print's one

[simgrid.git] / src / smpi / smpi_bench.c

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 06ce7c4..bec96df 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,5 +1,4 @@
 #include "private.h"
 #include "private.h"

-#include <string.h>

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
                                 "Logging specific to SMPI (benchmarking)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
                                 "Logging specific to SMPI (benchmarking)");


@@ -33,21 +32,26 @@ static void smpi_execute(double duration) {
   }
 }
 
   }
 }
 

-void smpi_bench_begin(const char* mpi_call) {
-  double simulated = smpi_process_simulated_elapsed();
+void smpi_bench_begin(MPI_Comm comm, const char* mpi_call) {
+  double now = SIMIX_get_clock();
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;

 
   if(mpi_call && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) {
 
   if(mpi_call && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) {

-    INFO2("SMPE: %s in %fs", mpi_call, simulated);
+    INFO3("SMPE: ts=%f rank=%d type=end et=%s", now, rank, mpi_call);

   }
   xbt_os_timer_start(smpi_process_timer());
 }
 
   }
   xbt_os_timer_start(smpi_process_timer());
 }
 

-void smpi_bench_end() {
+void smpi_bench_end(MPI_Comm comm, const char* mpi_call) {

   xbt_os_timer_t timer = smpi_process_timer();
   xbt_os_timer_t timer = smpi_process_timer();

+  double now = SIMIX_get_clock();
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;

 
   xbt_os_timer_stop(timer);
   smpi_execute(xbt_os_timer_elapsed(timer));
 
   xbt_os_timer_stop(timer);
   smpi_execute(xbt_os_timer_elapsed(timer));

-  smpi_process_simulated_reset();
+  if(mpi_call && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) {
+    INFO3("SMPE: ts=%f rank=%d type=begin et=%s", now, rank, mpi_call);
+  }

 }
 
 /*
 }
 
 /*