X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4263281a2286d2509215da95b78d72ad3cbbc6ed..93a44592f2e075710723814e39fc3ec3fe93888b:/src/smpi/smpi_bench.c

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index f879b9aef7..bec96dfcf0 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,88 +1,104 @@
 #include "private.h"
-#include <string.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (benchmarking)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
+                                "Logging specific to SMPI (benchmarking)");
 
-void smpi_execute(double duration) {
-        smx_host_t host = SIMIX_host_self();
-        smx_action_t action;
+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;
 
-	SIMIX_mutex_lock(smpi_global->execute_mutex);
-
-	action = SIMIX_action_execute(host, "execute", duration * SMPI_DEFAULT_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);
+  if(duration > 0.001) {
+    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");
+    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);
+  }
+}
 
-        SIMIX_mutex_unlock(smpi_global->execute_mutex);
+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;
 
-	return;
+  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);
+  }
+  xbt_os_timer_start(smpi_process_timer());
 }
 
-void smpi_start_timer()
-{
-	SIMIX_mutex_lock(smpi_global->timer_mutex);
-	xbt_os_timer_start(smpi_global->timer);
-}
+void smpi_bench_end(MPI_Comm comm, const char* mpi_call) {
+  xbt_os_timer_t timer = smpi_process_timer();
+  double now = SIMIX_get_clock();
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
 
-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;
+  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);
+  }
 }
 
-void smpi_bench_begin()
+/*
+TODO
+void smpi_do_once_1(const char *file, int line)
 {
-	smpi_start_timer();
-}
+  smpi_do_once_duration_node_t curr, prev;
 
-void smpi_bench_end()
-{
-	smpi_execute(smpi_stop_timer());
+  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);
 
-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;
+  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();
 }
+*/