Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Added flag for printing more debug info
[simgrid.git] / src / smpi / smpi_bench.c
index 6bb7a8d..cc81f08 100644 (file)
 #include "private.h"
 #include <string.h>
 
-void smpi_execute(double duration) {
-        smx_host_t host = SIMIX_host_self();
-        smx_action_t action;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
+                                "Logging specific to SMPI (benchmarking)");
 
-       SIMIX_mutex_lock(smpi_global->execute_mutex);
+void smpi_execute(double duration)
+{
+  smx_host_t host = SIMIX_host_self();
+  smx_mutex_t mutex = smpi_process_mutex();
+  smx_cond_t cond = smpi_process_cond();
+  smx_action_t action;
+  e_surf_action_state_t state;
+
+  if (duration < 0.001)
+    return;
+  DEBUG1("Sleep for %f to handle real computation time",duration);
+  SIMIX_mutex_lock(mutex);
 
-       action = SIMIX_action_execute(host, "execute", duration * SMPI_DEFAULT_SPEED);
+  action =
+    SIMIX_action_execute(host, "execute",
+                         duration * smpi_global->reference_speed);
 
-        SIMIX_register_action_to_condition(action, smpi_global->execute_cond);
-        SIMIX_cond_wait(smpi_global->execute_cond, smpi_global->execute_mutex);
-        SIMIX_unregister_action_to_condition(action, smpi_global->execute_cond);
-        SIMIX_action_destroy(action);
+  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_action_destroy(action);
 
-        SIMIX_mutex_unlock(smpi_global->execute_mutex);
+  SIMIX_mutex_unlock(mutex);
 
-       return;
+  return;
 }
 
 void smpi_start_timer()
 {
-       SIMIX_mutex_lock(smpi_global->timer_mutex);
-       xbt_os_timer_start(smpi_global->timer);
+  xbt_os_timer_start(smpi_global->timer);
 }
 
 double smpi_stop_timer()
 {
-       double duration;
-       xbt_os_timer_stop(smpi_global->timer);
-       duration = xbt_os_timer_elapsed(smpi_global->timer);
-       SIMIX_mutex_unlock(smpi_global->timer_mutex);
-       return duration;
+  double duration;
+  xbt_os_timer_stop(smpi_global->timer);
+  duration = xbt_os_timer_elapsed(smpi_global->timer);
+  return duration;
 }
 
 void smpi_bench_begin()
 {
-       smpi_start_timer();
+  smpi_start_timer();
 }
 
 void smpi_bench_end()
 {
-       smpi_execute(smpi_stop_timer());
+  smpi_execute(smpi_stop_timer());
 }
 
-void smpi_do_once_1(const char *file, int line) {
-       smpi_do_once_duration_node_t curr, prev;
-       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;
+void smpi_do_once_1(const char *file, int line)
+{
+  smpi_do_once_duration_node_t curr, prev;
+  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;
 }
 
-int smpi_do_once_2() {
-       double duration = *(smpi_global->do_once_duration);
-       if (0 < duration) {
-               SIMIX_mutex_unlock(smpi_global->do_once_mutex);
-               smpi_execute(duration);
-               smpi_bench_begin();
-               return 0;
-       }
-       smpi_start_timer();
-       return 1;
+int smpi_do_once_2()
+{
+  double duration = *(smpi_global->do_once_duration);
+  if (0 > duration) {
+    smpi_start_timer();
+    return 1;
+  }
+  SIMIX_mutex_unlock(smpi_global->do_once_mutex);
+  smpi_execute(duration);
+  smpi_bench_begin();
+  return 0;
 }
 
-void smpi_do_once_3() {
-       *(smpi_global->do_once_duration) = smpi_stop_timer();
+void smpi_do_once_3()
+{
+  *(smpi_global->do_once_duration) = smpi_stop_timer();
 }