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 73a3445..295f8ce 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,49 +1,99 @@
 #include "private.h"
 
 #include "private.h"
 

-// FIXME: could cause trouble with multithreaded procs on same host...
-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_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
+                                "Logging specific to SMPI (benchmarking)");

 
 

-       xbt_os_timer_start(smpi_global->timers[rank]);
+static void smpi_execute(double duration) {
+  smx_host_t host;
+  smx_action_t action;
+  smx_mutex_t mutex;
+  smx_cond_t cond;
+  e_surf_action_state_t state;

 
 

-       return;
+  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, "smpi/running_power");
+    action = SIMIX_action_execute(host, "computation", duration);
+    SIMIX_mutex_lock(mutex);
+    SIMIX_register_action_to_condition(action, cond);
+    for(state = SIMIX_action_get_state(action);
+        state == SURF_ACTION_READY ||
+        state == SURF_ACTION_RUNNING; state = SIMIX_action_get_state(action)) {
+      SIMIX_cond_wait(cond, mutex);
+    }
+    SIMIX_unregister_action_to_condition(action, cond);
+    SIMIX_mutex_unlock(mutex);
+    SIMIX_action_destroy(action);
+    SIMIX_cond_destroy(cond);
+    SIMIX_mutex_destroy(mutex);
+  }

 }
 
 }
 

-void smpi_bench_end()
-{
-       int rank = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
-       double duration;
-       smx_host_t host;
-       char computation[] = "computation";
-       smx_action_t action;
-       smx_mutex_t mutex;
-       smx_cond_t cond;
-
-       xbt_os_timer_stop(smpi_global->timers[rank]);
+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());
+}

 
 

-       duration = xbt_os_timer_elapsed(smpi_global->timers[rank]);
+void smpi_bench_end(int rank, const char* mpi_call) {
+  xbt_os_timer_t timer = smpi_process_timer();

 
 

-       SIMIX_mutex_unlock(smpi_global->timers_mutexes[rank]);
+  xbt_os_timer_stop(timer);
+  smpi_execute(xbt_os_timer_elapsed(timer));
+  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);
+  }
+}

 
 

-       host   = smpi_mpi_global->mpi_comm_world->hosts[rank];
-       action = SIMIX_action_execute(host, computation, duration * SMPI_DEFAULT_SPEED);
-       mutex  = SIMIX_mutex_init();
-       cond   = SIMIX_cond_init();
+/*
+TODO
+void smpi_do_once_1(const char *file, int line)
+{
+  smpi_do_once_duration_node_t curr, prev;

 
 

-       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);
+  smpi_bench_end();
+  SIMIX_mutex_lock(smpi_global->do_once_mutex);
+  prev = NULL;
+  for(curr = smpi_global->do_once_duration_nodes;
+      NULL != curr && (strcmp(curr->file, file) || curr->line != line);
+      curr = curr->next) {
+    prev = curr;
+  }
+  if(NULL == curr) {
+    curr = xbt_new(s_smpi_do_once_duration_node_t, 1);
+    curr->file = xbt_strdup(file);
+    curr->line = line;
+    curr->duration = -1;
+    curr->next = NULL;
+    if(NULL == prev) {
+      smpi_global->do_once_duration_nodes = curr;
+    } else {
+      prev->next = curr;
+    }
+  }
+  smpi_global->do_once_duration = &curr->duration;
+}

 
 

-       SIMIX_mutex_destroy(mutex);
-       SIMIX_cond_destroy(cond);
-       //SIMIX_action_destroy(action);
+int smpi_do_once_2()
+{
+  double duration = *(smpi_global->do_once_duration);

 
 

-       // FIXME: check for success/failure?
+  if(0 > duration) {
+    smpi_start_timer();
+    return 1;
+  }
+  SIMIX_mutex_unlock(smpi_global->do_once_mutex);
+  smpi_execute(duration);
+  smpi_bench_begin();
+  return 0;
+}

 
 

-       return;
+void smpi_do_once_3()
+{
+  *(smpi_global->do_once_duration) = smpi_stop_timer();

 }
 }

+*/