- smx_action_t act_sleep;
- xbt_assert0((mutex != NULL), "Invalid parameters");
-
- cond->mutex = mutex;
-
- SIMIX_mutex_unlock(mutex);
- /* create an action null only if there are no actions already on the condition, usefull if the host crashs */
- if (xbt_fifo_size(cond->actions) ==0 ) {
- 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);
- }
- /* get the mutex again */
- SIMIX_mutex_lock(cond->mutex);
-
- return;
+ smx_action_t act_sleep;
+ xbt_assert0((mutex != NULL), "Invalid parameters");
+
+ DEBUG1("Wait condition %p", cond);
+ cond->mutex = mutex;
+
+ SIMIX_mutex_unlock(mutex);
+ /* always create an action null in case there is a host failure */
+/* if (xbt_fifo_size(cond->actions) == 0) { */
+ act_sleep = SIMIX_action_sleep(SIMIX_host_self(), -1);
+ SIMIX_register_action_to_condition(act_sleep, cond);
+ __SIMIX_cond_wait(cond);
+ SIMIX_unregister_action_to_condition(act_sleep, cond);
+ SIMIX_action_destroy(act_sleep);
+/* } else { */
+/* __SIMIX_cond_wait(cond); */
+/* } */
+ /* get the mutex again */
+ SIMIX_mutex_lock(cond->mutex);
+
+ return;