X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07b23e956e96e9a73b3acbbf4639b3d464604a44..1d093eb0c576e2f7a1d6c7a707ee55026aca3915:/src/simix/smx_synchro.c

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index dd084b1f3e..218c6057bb 100644
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -135,8 +135,13 @@ void SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex)
 		act_sleep = SIMIX_action_sleep(SIMIX_host_self(), -1);
 		SIMIX_register_action_to_condition(act_sleep,cond);
 		SIMIX_register_condition_to_action(act_sleep,cond);
+		__SIMIX_cond_wait(cond);
+		xbt_fifo_pop(act_sleep->cond_list);
+		SIMIX_action_destroy(act_sleep);
+	}
+	else {
+		__SIMIX_cond_wait(cond);
 	}
-	__SIMIX_cond_wait(cond);
 	/* get the mutex again */
 	self->simdata->mutex = cond->mutex;
 	SIMIX_mutex_lock(cond->mutex);
@@ -201,12 +206,10 @@ void SIMIX_cond_broadcast(smx_cond_t cond)
 
 void SIMIX_cond_destroy(smx_cond_t cond)
 {
-	
 	if ( cond == NULL )
 		return ;
 	else {
 		xbt_assert0( xbt_swag_size(cond->sleeping) == 0 , "Cannot destroy conditional");
-
 		xbt_swag_free(cond->sleeping);
 		xbt_fifo_free(cond->actions);
 		xbt_free(cond);