void SIMIX_mutex_lock(smx_mutex_t mutex)
{
smx_process_t self = SIMIX_process_self();
-
xbt_assert0((mutex != NULL), "Invalid parameters");
+
if (mutex->using) {
/* somebody using the mutex, block */
xbt_swag_insert(self, mutex->sleeping);
self->simdata->mutex = mutex;
/* wait for some process make the unlock and wake up me from mutex->sleeping */
xbt_context_yield();
+ self->simdata->mutex = NULL;
+
/* verify if the process was suspended */
while (self->simdata->suspended) {
xbt_context_yield();
}
- self->simdata->mutex = NULL;
mutex->using = 1;
}
else {
void SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex)
{
- smx_process_t self = SIMIX_process_self();
smx_action_t act_sleep;
xbt_assert0((mutex != NULL), "Invalid parameters");
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);
return;
xbt_assert0((cond != NULL), "Invalid parameters");
/* process status */
- self->simdata->cond = cond;
+ self->simdata->cond = cond;
xbt_swag_insert(self, cond->sleeping);
xbt_context_yield();
self->simdata->cond = NULL;
void SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration)
{
- smx_process_t self = SIMIX_process_self();
xbt_assert0((mutex != NULL), "Invalid parameters");
smx_action_t act_sleep;
__SIMIX_cond_wait(cond);
/* get the mutex again */
- self->simdata->mutex = cond->mutex;
SIMIX_mutex_lock(cond->mutex);
return;
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);