X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0137f14a0c14e604049cfa61688d075686496f05..cddbbf6baa99c4ceae9ba97cc90eb2d7b24123b8:/src/smpi/smpi_bench.c

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 6bb7a8df9a..7fab85ea26 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,20 +1,32 @@
 #include "private.h"
 #include <string.h>
 
+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_mutex_t mutex = smpi_host_mutex();
+	smx_cond_t cond = smpi_host_cond();
         smx_action_t action;
+	e_surf_action_state_t state;
 
-	SIMIX_mutex_lock(smpi_global->execute_mutex);
+	SIMIX_mutex_lock(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_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;
 }
@@ -56,10 +68,10 @@ void smpi_do_once_1(const char *file, int line) {
 	}
 	if (NULL == curr) {
 		curr = xbt_new(s_smpi_do_once_duration_node_t, 1);
-		curr->file = xbt_strdup(file);
-		curr->line = line;
+		curr->file     = xbt_strdup(file);
+		curr->line     = line;
 		curr->duration = -1;
-		curr->next = NULL;
+		curr->next     = NULL;
 		if (NULL == prev) {
 			smpi_global->do_once_duration_nodes = curr;
 		} else {
@@ -71,14 +83,14 @@ void smpi_do_once_1(const char *file, int line) {
 
 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;
+	if (0 > duration) {
+		smpi_start_timer();
+		return 1;
 	}
-	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() {