-/* Copyright (c) 2007-2013. 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
static smx_action_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, timeout);
+ surf_workstation_sleep(smx_host, timeout);
- surf_workstation_model->action_data_set(action->synchro.sleep, action);
+ surf_action_set_data(action->synchro.sleep, action);
XBT_OUT();
return action;
}
{
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
- action->synchro.sleep->model_type->action_unref(action->synchro.sleep);
+ xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
+ surf_action_unref(action->synchro.sleep);
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
- if (surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_FAILED)
+ xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
+ if (surf_action_get_state(action->synchro.sleep) == SURF_ACTION_FAILED)
action->state = SIMIX_FAILED;
- else if(surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_DONE)
+ else if(surf_action_get_state(action->synchro.sleep) == SURF_ACTION_DONE)
action->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(action);
}
/*********************************** Mutex ************************************/
-smx_mutex_t SIMIX_pre_mutex_init(smx_simcall_t simcall){
+smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall){
return SIMIX_mutex_init();
}
/**
* \brief Handles a mutex lock simcall.
* \param simcall the simcall
*/
-void SIMIX_pre_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
+void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
{
XBT_IN("(%p)",simcall);
/* FIXME: check where to validate the arguments */
XBT_OUT();
}
-int SIMIX_pre_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex){
+int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex){
return SIMIX_mutex_trylock(mutex, simcall->issuer);
}
/**
return 1;
}
-void SIMIX_pre_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex){
+void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex){
SIMIX_mutex_unlock(mutex, simcall->issuer);
}
/**
XBT_OUT();
}
-void SIMIX_pre_mutex_destroy(smx_simcall_t simcall, smx_mutex_t mutex){
+void simcall_HANDLER_mutex_destroy(smx_simcall_t simcall, smx_mutex_t mutex){
SIMIX_mutex_destroy(mutex);
}
/**
/********************************* Condition **********************************/
-smx_cond_t SIMIX_pre_cond_init(smx_simcall_t simcall){
+smx_cond_t simcall_HANDLER_cond_init(smx_simcall_t simcall){
return SIMIX_cond_init();
}
/**
* \brief Handle a condition waiting simcall without timeouts
* \param simcall the simcall
*/
-void SIMIX_pre_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
+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;
* \brief Handle a condition waiting simcall with timeouts
* \param simcall the simcall
*/
-void SIMIX_pre_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
+void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
XBT_OUT();
}
-void SIMIX_pre_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
+void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
SIMIX_cond_signal(cond);
}
/**
mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall->call = SIMCALL_MUTEX_LOCK;
- SIMIX_pre_mutex_lock(simcall, mutex);
+ simcall_HANDLER_mutex_lock(simcall, mutex);
}
XBT_OUT();
}
-void SIMIX_pre_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
+void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
SIMIX_cond_broadcast(cond);
}
/**
XBT_OUT();
}
-void SIMIX_pre_cond_destroy(smx_simcall_t simcall, smx_cond_t cond){
+void simcall_HANDLER_cond_destroy(smx_simcall_t simcall, smx_cond_t cond){
SIMIX_cond_destroy(cond);
}
/**
/******************************** Semaphores **********************************/
#define SMX_SEM_NOLIMIT 99999
-smx_sem_t SIMIX_pre_sem_init(smx_simcall_t simcall, unsigned int value){
+smx_sem_t simcall_HANDLER_sem_init(smx_simcall_t simcall, unsigned int value){
return SIMIX_sem_init(value);
}
/** @brief Initialize a semaphore */
return sem;
}
-void SIMIX_pre_sem_destroy(smx_simcall_t simcall, smx_sem_t sem){
+void simcall_HANDLER_sem_destroy(smx_simcall_t simcall, smx_sem_t sem){
SIMIX_sem_destroy(sem);
}
/** @brief Destroys a semaphore */
XBT_OUT();
}
-void SIMIX_pre_sem_release(smx_simcall_t simcall, smx_sem_t sem){
+void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){
SIMIX_sem_release(sem);
}
/** @brief release the semaphore
return (sem->value <= 0);
}
-int SIMIX_pre_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem){
+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 */
* \brief Handles a sem acquire simcall without timeout.
* \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
+void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
XBT_IN("(%p)",simcall);
_SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
* \brief Handles a sem acquire simcall with timeout.
* \param simcall the simcall
*/
-void SIMIX_pre_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
+void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
XBT_IN("(%p)",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);
+}