Make SMPI parameters names more consistent.

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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index bec96df..295f8ce 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -10,12 +10,12 @@ static void smpi_execute(double duration) {
   smx_cond_t cond;
   e_surf_action_state_t state;
 
   smx_cond_t cond;
   e_surf_action_state_t state;
 

-  if(duration > 0.001) {
+  if(duration >= xbt_cfg_get_double(_surf_cfg_set, "smpi/cpu_threshold")) {

     host = SIMIX_host_self();
     mutex = SIMIX_mutex_init();
     cond = SIMIX_cond_init();
     DEBUG1("Sleep for %f to handle real computation time", duration);
     host = SIMIX_host_self();
     mutex = SIMIX_mutex_init();
     cond = SIMIX_cond_init();
     DEBUG1("Sleep for %f to handle real computation time", duration);

-    duration *= xbt_cfg_get_double(_surf_cfg_set, "reference_speed");
+    duration *= xbt_cfg_get_double(_surf_cfg_set, "smpi/running_power");

     action = SIMIX_action_execute(host, "computation", duration);
     SIMIX_mutex_lock(mutex);
     SIMIX_register_action_to_condition(action, cond);
     action = SIMIX_action_execute(host, "computation", duration);
     SIMIX_mutex_lock(mutex);
     SIMIX_register_action_to_condition(action, cond);


@@ -32,25 +32,20 @@ static void smpi_execute(double duration) {
   }
 }
 
   }
 }
 

-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")) {
-    INFO3("SMPE: ts=%f rank=%d type=end et=%s", now, rank, mpi_call);
+void smpi_bench_begin(int rank, const char* mpi_call) {
+  if(mpi_call && rank >= 0 && xbt_cfg_get_int(_surf_cfg_set, "smpi/log_events")) {
+    INFO3("SMPE: ts=%f rank=%d type=end et=%s", SIMIX_get_clock(), rank, mpi_call);

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

-void smpi_bench_end(MPI_Comm comm, const char* mpi_call) {
+void smpi_bench_end(int rank, 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));

-  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);
+  if(mpi_call && rank >= 0 && xbt_cfg_get_int(_surf_cfg_set, "smpi/log_events")) {
+    INFO3("SMPE: ts=%f rank=%d type=begin et=%s", SIMIX_get_clock(), rank, mpi_call);

   }
 }
 
   }
 }