/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "private.h"
+#include "smx_private.h"
#include "xbt/log.h"
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout);
static void SIMIX_synchro_finish(smx_action_t action);
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_process_t issuer, smx_req_t req);
+ smx_process_t issuer, smx_simcall_t simcall);
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
- smx_req_t req);
+ smx_simcall_t simcall);
/***************************** Synchro action *********************************/
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->extension.workstation.sleep(smx_host, timeout);
surf_workstation_model->action_data_set(action->synchro.sleep, action);
XBT_OUT();
return action;
}
-void SIMIX_synchro_stop_waiting(smx_process_t process, smx_req_t req)
+void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
{
- XBT_IN("(%p, %p)",process,req);
- switch (req->call) {
+ XBT_IN("(%p, %p)",process,simcall);
+ switch (simcall->call) {
- case REQ_MUTEX_LOCK:
- xbt_swag_remove(process, req->mutex_lock.mutex->sleeping);
+ case SIMCALL_MUTEX_LOCK:
+ xbt_swag_remove(process, simcall_mutex_lock__get__mutex(simcall)->sleeping);
break;
- case REQ_COND_WAIT:
- xbt_swag_remove(process, req->cond_wait.cond->sleeping);
+ case SIMCALL_COND_WAIT:
+ xbt_swag_remove(process, simcall_cond_wait__get__cond(simcall)->sleeping);
break;
- case REQ_COND_WAIT_TIMEOUT:
- xbt_swag_remove(process, req->cond_wait_timeout.cond->sleeping);
+ case SIMCALL_COND_WAIT_TIMEOUT:
+ xbt_swag_remove(process, simcall_cond_wait_timeout__get__cond(simcall)->sleeping);
break;
- case REQ_SEM_ACQUIRE:
- xbt_swag_remove(process, req->sem_acquire.sem->sleeping);
+ case SIMCALL_SEM_ACQUIRE:
+ xbt_swag_remove(process, simcall_sem_acquire__get__sem(simcall)->sleeping);
break;
- case REQ_SEM_ACQUIRE_TIMEOUT:
- xbt_swag_remove(process, req->sem_acquire_timeout.sem->sleeping);
+ case SIMCALL_SEM_ACQUIRE_TIMEOUT:
+ xbt_swag_remove(process, simcall_sem_acquire_timeout__get__sem(simcall)->sleeping);
break;
default:
static void SIMIX_synchro_finish(smx_action_t action)
{
XBT_IN("(%p)",action);
- smx_req_t req = xbt_fifo_shift(action->request_list);
+ smx_simcall_t simcall = xbt_fifo_shift(action->simcalls);
switch (action->state) {
case SIMIX_SRC_TIMEOUT:
- TRY {
- THROWF(timeout_error, 0, "Synchro's wait timeout");
- }
- CATCH(req->issuer->running_ctx->exception) {
- req->issuer->doexception = 1;
- }
+ SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Synchro's wait timeout");
break;
case SIMIX_FAILED:
- TRY {
- THROWF(host_error, 0, "Host failed");
- }
- CATCH(req->issuer->running_ctx->exception) {
- req->issuer->doexception = 1;
- }
+ simcall->issuer->context->iwannadie = 1;
+// SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
default:
break;
}
- SIMIX_synchro_stop_waiting(req->issuer, req);
+ SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
+ simcall->issuer->waiting_action = NULL;
SIMIX_synchro_destroy(action);
- SIMIX_request_answer(req);
+ SIMIX_simcall_answer(simcall);
XBT_OUT();
}
/*********************************** Mutex ************************************/
+smx_mutex_t SIMIX_pre_mutex_init(smx_simcall_t simcall){
+ return SIMIX_mutex_init();
+}
/**
* \brief Initialize a mutex.
*
}
/**
- * \brief Handle mutex lock request
- * \param req The request
+ * \brief Handles a mutex lock simcall.
+ * \param simcall the simcall
*/
-void SIMIX_pre_mutex_lock(smx_req_t req)
+void SIMIX_pre_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
{
- XBT_IN("(%p)",req);
+ XBT_IN("(%p)",simcall);
/* FIXME: check where to validate the arguments */
smx_action_t sync_act = NULL;
- smx_mutex_t mutex = req->mutex_lock.mutex;
- smx_process_t process = req->issuer;
+ 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->request_list, req);
- req->issuer->waiting_action = sync_act;
- xbt_swag_insert(req->issuer, mutex->sleeping);
+ xbt_fifo_push(sync_act->simcalls, simcall);
+ simcall->issuer->waiting_action = sync_act;
+ xbt_swag_insert(simcall->issuer, mutex->sleeping);
} else {
/* mutex free */
mutex->locked = 1;
- mutex->owner = req->issuer;
- SIMIX_request_answer(req);
+ mutex->owner = simcall->issuer;
+ SIMIX_simcall_answer(simcall);
}
XBT_OUT();
}
+int SIMIX_pre_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 SIMIX_pre_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) {
SIMIX_synchro_destroy(p->waiting_action);
p->waiting_action = NULL;
mutex->owner = p;
- SIMIX_request_answer(&p->request);
+ SIMIX_simcall_answer(&p->simcall);
} else {
/* nobody to wake up */
mutex->locked = 0;
XBT_OUT();
}
+void SIMIX_pre_mutex_destroy(smx_simcall_t simcall, smx_mutex_t mutex){
+ SIMIX_mutex_destroy(mutex);
+}
/**
* \brief Destroys a mutex.
*
/********************************* Condition **********************************/
+smx_cond_t SIMIX_pre_cond_init(smx_simcall_t simcall){
+ return SIMIX_cond_init();
+}
/**
* \brief Initialize a condition.
*
* 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 condition waiting requests without timeouts
- * \param The request
+ * \brief Handle a condition waiting simcall without timeouts
+ * \param simcall the simcall
*/
-void SIMIX_pre_cond_wait(smx_req_t req)
+void SIMIX_pre_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
- XBT_IN("(%p)",req);
- smx_process_t issuer = req->issuer;
- smx_cond_t cond = req->cond_wait.cond;
- smx_mutex_t mutex = req->cond_wait.mutex;
+ XBT_IN("(%p)",simcall);
+ smx_process_t issuer = simcall->issuer;
- _SIMIX_cond_wait(cond, mutex, -1, issuer, req);
+ _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
XBT_OUT();
}
/**
- * \brief Handle condition waiting requests with timeouts
- * \param The request
+ * \brief Handle a condition waiting simcall with timeouts
+ * \param simcall the simcall
*/
-void SIMIX_pre_cond_wait_timeout(smx_req_t req)
+void SIMIX_pre_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
+ smx_mutex_t mutex, double timeout)
{
- XBT_IN("(%p)",req);
- smx_process_t issuer = req->issuer;
- smx_cond_t cond = req->cond_wait_timeout.cond;
- smx_mutex_t mutex = req->cond_wait_timeout.mutex;
- double timeout = req->cond_wait_timeout.timeout;
+ XBT_IN("(%p)",simcall);
+ smx_process_t issuer = simcall->issuer;
- _SIMIX_cond_wait(cond, mutex, timeout, issuer, req);
+ _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
XBT_OUT();
}
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_process_t issuer, smx_req_t req)
+ smx_process_t issuer, smx_simcall_t simcall)
{
- XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,req);
+ XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
smx_action_t sync_act = NULL;
XBT_DEBUG("Wait condition %p", cond);
}
sync_act = SIMIX_synchro_wait(issuer->smx_host, timeout);
- xbt_fifo_unshift(sync_act->request_list, req);
+ xbt_fifo_unshift(sync_act->simcalls, simcall);
issuer->waiting_action = sync_act;
- xbt_swag_insert(req->issuer, cond->sleeping);
+ xbt_swag_insert(simcall->issuer, cond->sleeping);
XBT_OUT();
}
+void SIMIX_pre_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
+ SIMIX_cond_signal(cond);
+}
/**
* \brief Signalizes a condition.
*
XBT_IN("(%p)",cond);
smx_process_t proc = NULL;
smx_mutex_t mutex = NULL;
- smx_req_t req = NULL;
+ smx_simcall_t simcall = NULL;
XBT_DEBUG("Signal condition %p", cond);
SIMIX_synchro_destroy(proc->waiting_action);
proc->waiting_action = NULL;
- /* Now transform the cond wait request into a mutex lock one */
- req = &proc->request;
- if(req->call == REQ_COND_WAIT)
- mutex = req->cond_wait.mutex;
+ /* Now transform the cond wait simcall into a mutex lock one */
+ simcall = &proc->simcall;
+ if(simcall->call == SIMCALL_COND_WAIT)
+ mutex = simcall_cond_wait__get__mutex(simcall);
else
- mutex = req->cond_wait_timeout.mutex;
-
- req->call = REQ_MUTEX_LOCK;
- req->mutex_lock.mutex = mutex;
+ mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+ simcall->call = SIMCALL_MUTEX_LOCK;
- SIMIX_pre_mutex_lock(req);
+ SIMIX_pre_mutex_lock(simcall, mutex);
}
XBT_OUT();
}
+void SIMIX_pre_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
+ SIMIX_cond_broadcast(cond);
+}
/**
* \brief Broadcasts a condition.
*
XBT_OUT();
}
+void SIMIX_pre_cond_destroy(smx_simcall_t simcall, smx_cond_t cond){
+ SIMIX_cond_destroy(cond);
+}
/**
* \brief Destroys a contidion.
*
/******************************** Semaphores **********************************/
#define SMX_SEM_NOLIMIT 99999
+smx_sem_t SIMIX_pre_sem_init(smx_simcall_t simcall, unsigned int value){
+ return SIMIX_sem_init(value);
+}
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
- XBT_IN("(%d)",value);
+ XBT_IN("(%u)",value);
s_smx_process_t p;
smx_sem_t sem = xbt_new0(s_smx_sem_t, 1);
return sem;
}
+void SIMIX_pre_sem_destroy(smx_simcall_t simcall, smx_sem_t sem){
+ SIMIX_sem_destroy(sem);
+}
/** @brief Destroys a semaphore */
void SIMIX_sem_destroy(smx_sem_t sem)
{
XBT_OUT();
}
+void SIMIX_pre_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_request_answer(&proc->request);
+ SIMIX_simcall_answer(&proc->simcall);
} else if (sem->value < SMX_SEM_NOLIMIT) {
sem->value++;
}
return (sem->value <= 0);
}
+int SIMIX_pre_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)
{
}
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
- smx_req_t req)
+ smx_simcall_t simcall)
{
- XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,req);
+ XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);
smx_action_t sync_act = 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->request_list, req);
+ xbt_fifo_unshift(sync_act->simcalls, simcall);
issuer->waiting_action = sync_act;
xbt_swag_insert(issuer, sem->sleeping);
} else {
sem->value--;
- SIMIX_request_answer(req);
+ SIMIX_simcall_answer(simcall);
}
XBT_OUT();
}
/**
- * \brief Handle sem acquire requests without timeouts
+ * \brief Handles a sem acquire simcall without timeout.
+ * \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire(smx_req_t req)
+void SIMIX_pre_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
- XBT_IN("(%p)",req);
- _SIMIX_sem_wait(req->sem_acquire.sem, -1, req->issuer, req);
+ XBT_IN("(%p)",simcall);
+ _SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
XBT_OUT();
}
/**
- * \brief Handle sem acquire requests with timeouts
+ * \brief Handles a sem acquire simcall with timeout.
+ * \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire_timeout(smx_req_t req)
+void SIMIX_pre_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
- XBT_IN("(%p)",req);
- _SIMIX_sem_wait(req->sem_acquire_timeout.sem,
- req->sem_acquire_timeout.timeout, req->issuer, req);
+ XBT_IN("(%p)",simcall);
+ _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}
