-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
- "Logging specific to SIMIX (synchronization)");
+ "SIMIX Synchronization (mutex, semaphores and conditions)");
-static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout);
-static void SIMIX_synchro_finish(smx_action_t action);
+static smx_synchro_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout);
+static void SIMIX_synchro_finish(smx_synchro_t synchro);
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
smx_process_t issuer, smx_simcall_t simcall);
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
smx_simcall_t simcall);
-/***************************** Synchro action *********************************/
+/***************************** Raw synchronization *********************************/
-static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
+static smx_synchro_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
- smx_action_t action;
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_SYNCHRO;
- action->name = xbt_strdup("synchro");
- action->synchro.sleep =
- surf_workstation_model->extension.workstation.sleep(smx_host->host, timeout);
-
- surf_workstation_model->action_data_set(action->synchro.sleep, action);
+
+ smx_synchro_t sync;
+ sync = xbt_mallocator_get(simix_global->synchro_mallocator);
+ sync->type = SIMIX_SYNC_SYNCHRO;
+ sync->name = xbt_strdup("synchro");
+ sync->synchro.sleep =
+ surf_workstation_sleep(smx_host, timeout);
+
+ surf_action_set_data(sync->synchro.sleep, sync);
XBT_OUT();
- return action;
+ return sync;
}
void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
switch (simcall->call) {
case SIMCALL_MUTEX_LOCK:
- xbt_swag_remove(process, simcall->mutex_lock.mutex->sleeping);
+ xbt_swag_remove(process, simcall_mutex_lock__get__mutex(simcall)->sleeping);
break;
case SIMCALL_COND_WAIT:
- xbt_swag_remove(process, simcall->cond_wait.cond->sleeping);
+ xbt_swag_remove(process, simcall_cond_wait__get__cond(simcall)->sleeping);
break;
case SIMCALL_COND_WAIT_TIMEOUT:
- xbt_swag_remove(process, simcall->cond_wait_timeout.cond->sleeping);
+ xbt_swag_remove(process, simcall_cond_wait_timeout__get__cond(simcall)->sleeping);
break;
case SIMCALL_SEM_ACQUIRE:
- xbt_swag_remove(process, simcall->sem_acquire.sem->sleeping);
+ xbt_swag_remove(process, simcall_sem_acquire__get__sem(simcall)->sleeping);
break;
case SIMCALL_SEM_ACQUIRE_TIMEOUT:
- xbt_swag_remove(process, simcall->sem_acquire_timeout.sem->sleeping);
+ xbt_swag_remove(process, simcall_sem_acquire_timeout__get__sem(simcall)->sleeping);
break;
default:
XBT_OUT();
}
-void SIMIX_synchro_destroy(smx_action_t action)
+void SIMIX_synchro_destroy(smx_synchro_t synchro)
{
- XBT_IN("(%p)",action);
- XBT_DEBUG("Destroying synchro %p", action);
- action->synchro.sleep->model_type->action_unref(action->synchro.sleep);
- xbt_free(action->name);
- xbt_mallocator_release(simix_global->action_mallocator, action);
+ XBT_IN("(%p)",synchro);
+ XBT_DEBUG("Destroying synchro %p", synchro);
+ xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
+ surf_action_unref(synchro->synchro.sleep);
+ xbt_free(synchro->name);
+ xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
XBT_OUT();
}
-void SIMIX_post_synchro(smx_action_t action)
+void SIMIX_post_synchro(smx_synchro_t synchro)
{
- XBT_IN("(%p)",action);
- if (surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_FAILED)
- action->state = SIMIX_FAILED;
- else if(surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_DONE)
- action->state = SIMIX_SRC_TIMEOUT;
-
- SIMIX_synchro_finish(action);
+ XBT_IN("(%p)",synchro);
+ xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
+ if (surf_action_get_state(synchro->synchro.sleep) == SURF_ACTION_FAILED)
+ synchro->state = SIMIX_FAILED;
+ else if(surf_action_get_state(synchro->synchro.sleep) == SURF_ACTION_DONE)
+ synchro->state = SIMIX_SRC_TIMEOUT;
+
+ SIMIX_synchro_finish(synchro);
XBT_OUT();
}
-static void SIMIX_synchro_finish(smx_action_t action)
+static void SIMIX_synchro_finish(smx_synchro_t synchro)
{
- XBT_IN("(%p)",action);
- smx_simcall_t simcall = xbt_fifo_shift(action->simcalls);
+ XBT_IN("(%p)",synchro);
+ smx_simcall_t simcall = xbt_fifo_shift(synchro->simcalls);
- switch (action->state) {
+ switch (synchro->state) {
case SIMIX_SRC_TIMEOUT:
SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Synchro's wait timeout");
break;
case SIMIX_FAILED:
- SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
+ simcall->issuer->context->iwannadie = 1;
+// SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
default:
}
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
- SIMIX_synchro_destroy(action);
+ simcall->issuer->waiting_synchro = NULL;
+ SIMIX_synchro_destroy(synchro);
SIMIX_simcall_answer(simcall);
XBT_OUT();
}
/*********************************** Mutex ************************************/
+smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall){
+ return SIMIX_mutex_init();
+}
/**
* \brief Initialize a mutex.
*
* \brief Handles a mutex lock simcall.
* \param simcall the simcall
*/
-void SIMIX_pre_mutex_lock(smx_simcall_t simcall)
+void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
{
XBT_IN("(%p)",simcall);
/* FIXME: check where to validate the arguments */
- smx_action_t sync_act = NULL;
- smx_mutex_t mutex = simcall->mutex_lock.mutex;
+ smx_synchro_t synchro = NULL;
smx_process_t process = simcall->issuer;
if (mutex->locked) {
/* FIXME: check if the host is active ? */
- /* Somebody using the mutex, use a synchro action to get host failures */
- sync_act = SIMIX_synchro_wait(process->smx_host, -1);
- xbt_fifo_push(sync_act->simcalls, simcall);
- simcall->issuer->waiting_action = sync_act;
+ /* Somebody using the mutex, use a synchronization to get host failures */
+ synchro = SIMIX_synchro_wait(process->smx_host, -1);
+ xbt_fifo_push(synchro->simcalls, simcall);
+ simcall->issuer->waiting_synchro = synchro;
xbt_swag_insert(simcall->issuer, mutex->sleeping);
} else {
/* mutex free */
XBT_OUT();
}
+int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex){
+ return SIMIX_mutex_trylock(mutex, simcall->issuer);
+}
/**
* \brief Tries to lock a mutex.
*
{
XBT_IN("(%p, %p)",mutex,issuer);
if (mutex->locked){
- XBT_OUT();
- return 0;
+ XBT_OUT();
+ return 0;
}
mutex->locked = 1;
return 1;
}
+void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex){
+ SIMIX_mutex_unlock(mutex, simcall->issuer);
+}
/**
* \brief Unlocks a mutex.
*
/* If the mutex is not owned by the issuer do nothing */
if (issuer != mutex->owner){
- XBT_OUT();
- return;
+ XBT_OUT();
+ return;
}
if (xbt_swag_size(mutex->sleeping) > 0) {
p = xbt_swag_extract(mutex->sleeping);
- SIMIX_synchro_destroy(p->waiting_action);
- p->waiting_action = NULL;
+ SIMIX_synchro_destroy(p->waiting_synchro);
+ p->waiting_synchro = NULL;
mutex->owner = p;
SIMIX_simcall_answer(&p->simcall);
} else {
* It have to be called before the use of the condition.
* \return A condition
*/
-smx_cond_t SIMIX_cond_init()
+smx_cond_t SIMIX_cond_init(void)
{
XBT_IN("()");
s_smx_process_t p;
* \brief Handle a condition waiting simcall without timeouts
* \param simcall the simcall
*/
-void SIMIX_pre_cond_wait(smx_simcall_t simcall)
+void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
XBT_IN("(%p)",simcall);
smx_process_t issuer = simcall->issuer;
- smx_cond_t cond = simcall->cond_wait.cond;
- smx_mutex_t mutex = simcall->cond_wait.mutex;
_SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
XBT_OUT();
* \brief Handle a condition waiting simcall with timeouts
* \param simcall the simcall
*/
-void SIMIX_pre_cond_wait_timeout(smx_simcall_t simcall)
+void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
+ smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
smx_process_t issuer = simcall->issuer;
- smx_cond_t cond = simcall->cond_wait_timeout.cond;
- smx_mutex_t mutex = simcall->cond_wait_timeout.mutex;
- double timeout = simcall->cond_wait_timeout.timeout;
_SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
XBT_OUT();
smx_process_t issuer, smx_simcall_t simcall)
{
XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
- smx_action_t sync_act = NULL;
+ smx_synchro_t synchro = NULL;
XBT_DEBUG("Wait condition %p", cond);
SIMIX_mutex_unlock(mutex, issuer);
}
- sync_act = SIMIX_synchro_wait(issuer->smx_host, timeout);
- xbt_fifo_unshift(sync_act->simcalls, simcall);
- issuer->waiting_action = sync_act;
+ synchro = SIMIX_synchro_wait(issuer->smx_host, timeout);
+ xbt_fifo_unshift(synchro->simcalls, simcall);
+ issuer->waiting_synchro = synchro;
xbt_swag_insert(simcall->issuer, cond->sleeping);
XBT_OUT();
}
to make it acquire the mutex */
if ((proc = xbt_swag_extract(cond->sleeping))) {
- /* Destroy waiter's synchro action */
- SIMIX_synchro_destroy(proc->waiting_action);
- proc->waiting_action = NULL;
+ /* Destroy waiter's synchronization */
+ SIMIX_synchro_destroy(proc->waiting_synchro);
+ proc->waiting_synchro = NULL;
/* Now transform the cond wait simcall into a mutex lock one */
simcall = &proc->simcall;
if(simcall->call == SIMCALL_COND_WAIT)
- mutex = simcall->cond_wait.mutex;
+ mutex = simcall_cond_wait__get__mutex(simcall);
else
- mutex = simcall->cond_wait_timeout.mutex;
-
+ mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall->call = SIMCALL_MUTEX_LOCK;
- simcall->mutex_lock.mutex = mutex;
- SIMIX_pre_mutex_lock(simcall);
+ simcall_HANDLER_mutex_lock(simcall, mutex);
}
XBT_OUT();
}
}
/**
- * \brief Destroys a contidion.
+ * \brief Destroys a condition.
*
* Destroys and frees the condition's memory.
* \param cond A condition
XBT_OUT();
}
+void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){
+ SIMIX_sem_release(sem);
+}
/** @brief release the semaphore
*
* Unlock a process waiting on the semaphore.
XBT_DEBUG("Sem release semaphore %p", sem);
if ((proc = xbt_swag_extract(sem->sleeping))) {
- proc = xbt_swag_extract(sem->sleeping);
- SIMIX_synchro_destroy(proc->waiting_action);
- proc->waiting_action = NULL;
+ SIMIX_synchro_destroy(proc->waiting_synchro);
+ proc->waiting_synchro = NULL;
SIMIX_simcall_answer(&proc->simcall);
} else if (sem->value < SMX_SEM_NOLIMIT) {
sem->value++;
}
/** @brief Returns true if acquiring this semaphore would block */
-XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem)
+int SIMIX_sem_would_block(smx_sem_t sem)
{
XBT_IN("(%p)",sem);
XBT_OUT();
return (sem->value <= 0);
}
+int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem){
+ return SIMIX_sem_get_capacity(sem);
+}
/** @brief Returns the current capacity of the semaphore */
int SIMIX_sem_get_capacity(smx_sem_t sem)
{
smx_simcall_t simcall)
{
XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);
- smx_action_t sync_act = NULL;
+ smx_synchro_t synchro = NULL;
XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout);
if (sem->value <= 0) {
- sync_act = SIMIX_synchro_wait(issuer->smx_host, timeout);
- xbt_fifo_unshift(sync_act->simcalls, simcall);
- issuer->waiting_action = sync_act;
+ synchro = SIMIX_synchro_wait(issuer->smx_host, timeout);
+ xbt_fifo_unshift(synchro->simcalls, simcall);
+ issuer->waiting_synchro = synchro;
xbt_swag_insert(issuer, sem->sleeping);
} else {
sem->value--;
* \brief Handles a sem acquire simcall without timeout.
* \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire(smx_simcall_t simcall)
+void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
XBT_IN("(%p)",simcall);
- _SIMIX_sem_wait(simcall->sem_acquire.sem, -1, simcall->issuer, simcall);
+ _SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
XBT_OUT();
}
* \brief Handles a sem acquire simcall with timeout.
* \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire_timeout(smx_simcall_t simcall)
+void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
XBT_IN("(%p)",simcall);
- _SIMIX_sem_wait(simcall->sem_acquire_timeout.sem,
- simcall->sem_acquire_timeout.timeout, simcall->issuer, simcall);
+ _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}
+int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) {
+ return SIMIX_sem_would_block(sem);
+}
