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:
}
/*********************************** Mutex ************************************/
+smx_mutex_t SIMIX_pre_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 SIMIX_pre_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_process_t process = simcall->issuer;
if (mutex->locked) {
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.
*
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.
*
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 a condition waiting simcall without timeouts
* \param simcall the simcall
*/
-void SIMIX_pre_cond_wait(smx_simcall_t simcall)
+void SIMIX_pre_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 SIMIX_pre_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();
XBT_OUT();
}
+void SIMIX_pre_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
+ SIMIX_cond_signal(cond);
+}
/**
* \brief Signalizes a condition.
*
mutex = simcall->cond_wait_timeout.mutex;
simcall->call = SIMCALL_MUTEX_LOCK;
- simcall->mutex_lock.mutex = mutex;
- SIMIX_pre_mutex_lock(simcall);
+ 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)
{
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_OUT();
}
+XBT_INLINE int SIMIX_pre_sem_would_block(smx_simcall_t simcall, smx_sem_t sem){
+ return SIMIX_sem_would_block(sem);
+}
/** @brief Returns true if acquiring this semaphore would block */
XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem)
{
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)
{
* \brief Handles a sem acquire simcall without timeout.
* \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire(smx_simcall_t simcall)
+void SIMIX_pre_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 SIMIX_pre_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();
}
