X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1cf83d8b6d8f117236c74b8218a13a2e7e9769d6..1d4461b3c05d8f19d40b4aa29f86cb4fa8c80e58:/src/smpi/smpi_bench.c

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 1ff5814f76..c449dfb784 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+  * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
@@ -10,12 +16,12 @@ static void smpi_execute(double duration) {
   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);
-    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);
@@ -33,22 +39,19 @@ static void smpi_execute(double duration) {
 }
 
 void smpi_bench_begin(int rank, const char* mpi_call) {
-  double now = SIMIX_get_clock();
-
-  if(mpi_call && rank > 0 && xbt_cfg_get_int(_surf_cfg_set, "SMPE")) {
-    INFO3("SMPE: ts=%f rank=%d type=end 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=end et=%s", SIMIX_get_clock(), rank, mpi_call);
   }
   xbt_os_timer_start(smpi_process_timer());
 }
 
 void smpi_bench_end(int rank, const char* mpi_call) {
   xbt_os_timer_t timer = smpi_process_timer();
-  double now = SIMIX_get_clock();
 
   xbt_os_timer_stop(timer);
   smpi_execute(xbt_os_timer_elapsed(timer));
-  if(mpi_call && rank > 0 && 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);
   }
 }