X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7740c25f68f21ce361c63ab639a7fe3cd18042b..773e09f91e02cdd7e30e221f2bd6f39e97896b16:/src/smpi/smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index af72607205..08d693c226 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -165,9 +165,13 @@ void smpi_global_init()
 	smpi_global->timer                               = xbt_os_timer_new();
 	smpi_global->timer_mutex                         = SIMIX_mutex_init();
 	smpi_global->timer_cond                          = SIMIX_cond_init();
+
 	smpi_global->times_max                           = 0;
 	smpi_global->times_mutex                         = SIMIX_mutex_init();
 
+	smpi_global->execute_mutex                       = SIMIX_mutex_init();
+	smpi_global->execute_cond                        = SIMIX_cond_init();
+
 	for (i = 0; i < size; i++) {
 		smpi_global->pending_send_request_queues[i]         = xbt_fifo_new();
 		smpi_global->pending_send_request_queues_mutexes[i] = SIMIX_mutex_init();
@@ -208,6 +212,8 @@ void smpi_global_destroy()
 	SIMIX_mutex_destroy(smpi_global->timer_mutex);
 	SIMIX_cond_destroy(smpi_global->timer_cond);
 	SIMIX_mutex_destroy(smpi_global->times_mutex);
+	SIMIX_mutex_destroy(smpi_global->execute_mutex);
+	SIMIX_cond_destroy(smpi_global->execute_cond);
 
 	for(i = 0; i < size; i++) {
 		xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
@@ -238,7 +244,7 @@ int smpi_host_index()
 	return hdata->index;
 }
 
-int smpi_run_simulation(int argc, char **argv)
+int smpi_run_simulation(int *argc, char **argv)
 {
 	xbt_fifo_item_t cond_item   = NULL;
 	smx_cond_t   cond           = NULL;
@@ -250,7 +256,7 @@ int smpi_run_simulation(int argc, char **argv)
 
 	srand(SMPI_RAND_SEED);
 
-	SIMIX_global_init(&argc, argv);
+	SIMIX_global_init(argc, argv);
 
 	SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
 	SIMIX_function_register("smpi_sender",         smpi_sender);