updated smpirun to use new xml format and made changes to benchmark code to

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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index aec13c0..b43a128 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,49 +1,32 @@
 #include "private.h"
 
 // FIXME: could cause trouble with multithreaded procs on same host...
+// FIXME: add benchmarking flag?
+
 void smpi_bench_begin()
 {
-       int rank = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
-
-       SIMIX_mutex_lock(smpi_global->timers_mutexes[rank]);
-
-       xbt_os_timer_start(smpi_global->timers[rank]);
-
+       SIMIX_mutex_lock(smpi_global->timer_mutex);
+       xbt_os_timer_start(smpi_global->timer);
        return;
 }
 
 void smpi_bench_end()
 {
-       int rank = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
        double duration;
        smx_host_t host;
-       char compute[] = "compute";
+       char computation[] = "computation";
        smx_action_t action;
-       smx_mutex_t mutex;
-       smx_cond_t cond;
-
-       xbt_os_timer_stop(smpi_global->timers[rank]);
-
-       duration = xbt_os_timer_elapsed(smpi_global->timers[rank]);
-
-       SIMIX_mutex_unlock(smpi_global->timers_mutexes[rank]);
-
-       host   = smpi_mpi_global->mpi_comm_world->hosts[rank];
-       action = SIMIX_action_execute(host, compute, duration * SMPI_DEFAULT_SPEED);
-       mutex  = SIMIX_mutex_init();
-       cond   = SIMIX_cond_init();
 
-       SIMIX_mutex_lock(mutex);
-       SIMIX_register_action_to_condition(action, cond);
-       SIMIX_cond_wait(cond, mutex);
-       SIMIX_unregister_action_to_condition(action, cond);
-       SIMIX_mutex_unlock(mutex);
+       xbt_os_timer_stop(smpi_global->timer);
+       duration = xbt_os_timer_elapsed(smpi_global->timer);
+       host     = SIMIX_host_self();
+       action   = SIMIX_action_execute(host, computation, duration * SMPI_DEFAULT_SPEED);
 
-       SIMIX_mutex_destroy(mutex);
-       SIMIX_cond_destroy(cond);
-       SIMIX_action_destroy(action);
+       SIMIX_register_action_to_condition(action, smpi_global->timer_cond);
+       SIMIX_cond_wait(smpi_global->timer_cond, smpi_global->timer_mutex);
+       SIMIX_unregister_action_to_condition(action, smpi_global->timer_cond);
 
-       // FIXME: check for success/failure?
+       SIMIX_mutex_unlock(smpi_global->timer_mutex);
 
        return;
 }