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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index b43a1280f7..7fab85ea26 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -1,32 +1,98 @@
 #include "private.h"
+#include <string.h>
 
-// FIXME: could cause trouble with multithreaded procs on same host...
-// FIXME: add benchmarking flag?
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (benchmarking)");
 
-void smpi_bench_begin()
+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(mutex);
+
+	action = SIMIX_action_execute(host, "execute", duration * SMPI_DEFAULT_SPEED);
+
+        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(mutex);
+
+	return;
+}
+
+void smpi_start_timer()
 {
 	SIMIX_mutex_lock(smpi_global->timer_mutex);
 	xbt_os_timer_start(smpi_global->timer);
-	return;
 }
 
-void smpi_bench_end()
+double smpi_stop_timer()
 {
 	double duration;
-	smx_host_t host;
-	char computation[] = "computation";
-	smx_action_t action;
-
 	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_unlock(smpi_global->timer_mutex);
+	return duration;
+}
 
-	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);
+void smpi_bench_begin()
+{
+	smpi_start_timer();
+}
 
-	SIMIX_mutex_unlock(smpi_global->timer_mutex);
+void smpi_bench_end()
+{
+	smpi_execute(smpi_stop_timer());
+}
 
-	return;
+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) {
+		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();
 }