X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8806906f6ee71257fe0ddb66c886ad12d23aed9a..945f379f0d3d7f8e923ee114de2e492e1cb5486f:/src/simix/smx_synchro.c

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index f2feb6b61c..730e2cd520 100644
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -96,9 +96,9 @@ int SIMIX_mutex_trylock(smx_mutex_t mutex)
 void SIMIX_mutex_unlock(smx_mutex_t mutex)
 {
 	smx_process_t p;	/*process to wake up */
-	
+
 	xbt_assert0((mutex != NULL), "Invalid parameters");
-	
+
 	if (xbt_swag_size(mutex->sleeping) > 0) {
 		p = xbt_swag_extract(mutex->sleeping);
 		mutex->using = 0;
@@ -199,6 +199,11 @@ void SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex)
 	return;
 }
 
+xbt_fifo_t SIMIX_cond_get_actions(smx_cond_t cond)
+{
+	xbt_assert0((cond != NULL), "Invalid parameters");
+	return cond->actions;
+}
 
 void __SIMIX_cond_wait(smx_cond_t cond)
 {
@@ -221,7 +226,7 @@ void __SIMIX_cond_wait(smx_cond_t cond)
 /**
  * \brief Waits on a condition with timeout.
  *
- * Same behavior of #SIMIX_cond_wait, but waits a maximum time.
+ * Same behavior of #SIMIX_cond_wait, but waits a maximum time and throws an timeout_error if it happens.
  * \param cond A condition
  * \param mutex A mutex
  * \param max_duration Timeout time
@@ -238,8 +243,19 @@ void SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_durat
 		act_sleep = SIMIX_action_sleep(SIMIX_host_self(), max_duration);
 		SIMIX_register_action_to_condition(act_sleep,cond);
 		SIMIX_register_condition_to_action(act_sleep,cond);
+		__SIMIX_cond_wait(cond);
+		xbt_fifo_remove(act_sleep->cond_list,cond);
+		if ( SIMIX_action_get_state(act_sleep) == SURF_ACTION_DONE) {
+			SIMIX_action_destroy(act_sleep);
+			THROW0(timeout_error,0,"Condition timeout"); 
+		}
+		else {
+			SIMIX_action_destroy(act_sleep);
+		}
+
 	}
-	__SIMIX_cond_wait(cond);
+	else
+		__SIMIX_cond_wait(cond);
 
 	/* get the mutex again */
 	SIMIX_mutex_lock(cond->mutex);