A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generate automatically the simcall_HANDLER_* prototypes
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
58e0b85
..
66005c3
100644
(file)
--- a/
src/simix/smx_synchro.c
+++ b/
src/simix/smx_synchro.c
@@
-1,4
+1,4
@@
-/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-23,16
+23,15
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
- surf_model_t ws_model = surf_resource_model(smx_host, SURF_WKS_LEVEL);
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 =
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 =
-
ws_model->extension.workstation.
sleep(smx_host, timeout);
+
surf_workstation_
sleep(smx_host, timeout);
-
ws_model->action_data_set
(action->synchro.sleep, action);
+
surf_action_set_data
(action->synchro.sleep, action);
XBT_OUT();
return action;
}
XBT_OUT();
return action;
}
@@
-73,8
+72,7
@@
void SIMIX_synchro_destroy(smx_action_t action)
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
-
- action->synchro.sleep->model_obj->action_unref(action->synchro.sleep);
+ surf_action_unref(action->synchro.sleep);
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
@@
-84,11
+82,9
@@
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
{
XBT_IN("(%p)",action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
- surf_model_t ws_model = action->synchro.sleep->model_obj;
-
- if (ws_model->action_state_get(action->synchro.sleep) == SURF_ACTION_FAILED)
+ if (surf_action_get_state(action->synchro.sleep) == SURF_ACTION_FAILED)
action->state = SIMIX_FAILED;
action->state = SIMIX_FAILED;
- else if(
ws_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);
action->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(action);
@@
-124,7
+120,7
@@
static void SIMIX_synchro_finish(smx_action_t action)
}
/*********************************** Mutex ************************************/
}
/*********************************** 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();
}
/**
return SIMIX_mutex_init();
}
/**
@@
-149,7
+145,7
@@
smx_mutex_t SIMIX_mutex_init(void)
* \brief Handles a mutex lock simcall.
* \param simcall the simcall
*/
* \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_IN("(%p)",simcall);
/* FIXME: check where to validate the arguments */
@@
-172,7
+168,7
@@
void SIMIX_pre_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
XBT_OUT();
}
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 SIMIX_mutex_trylock(mutex, simcall->issuer);
}
/**
@@
-198,7
+194,7
@@
int SIMIX_mutex_trylock(smx_mutex_t mutex, smx_process_t issuer)
return 1;
}
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);
}
/**
SIMIX_mutex_unlock(mutex, simcall->issuer);
}
/**
@@
-235,7
+231,7
@@
void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
XBT_OUT();
}
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);
}
/**
SIMIX_mutex_destroy(mutex);
}
/**
@@
-256,7
+252,7
@@
void SIMIX_mutex_destroy(smx_mutex_t mutex)
/********************************* Condition **********************************/
/********************************* 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();
}
/**
return SIMIX_cond_init();
}
/**
@@
-281,7
+277,7
@@
smx_cond_t SIMIX_cond_init(void)
* \brief Handle a condition waiting simcall without timeouts
* \param simcall the simcall
*/
* \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;
{
XBT_IN("(%p)",simcall);
smx_process_t issuer = simcall->issuer;
@@
-294,7
+290,7
@@
void SIMIX_pre_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mut
* \brief Handle a condition waiting simcall with timeouts
* \param simcall the simcall
*/
* \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);
smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
@@
-327,7
+323,7
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
XBT_OUT();
}
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);
}
/**
SIMIX_cond_signal(cond);
}
/**
@@
-362,12
+358,12
@@
void SIMIX_cond_signal(smx_cond_t cond)
mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall->call = SIMCALL_MUTEX_LOCK;
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();
}
}
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);
}
/**
SIMIX_cond_broadcast(cond);
}
/**
@@
-389,7
+385,7
@@
void SIMIX_cond_broadcast(smx_cond_t cond)
XBT_OUT();
}
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);
}
/**
SIMIX_cond_destroy(cond);
}
/**
@@
-415,7
+411,7
@@
void SIMIX_cond_destroy(smx_cond_t cond)
/******************************** Semaphores **********************************/
#define SMX_SEM_NOLIMIT 99999
/******************************** 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 SIMIX_sem_init(value);
}
/** @brief Initialize a semaphore */
@@
-431,7
+427,7
@@
smx_sem_t SIMIX_sem_init(unsigned int value)
return sem;
}
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 */
SIMIX_sem_destroy(sem);
}
/** @brief Destroys a semaphore */
@@
-448,7
+444,7
@@
void SIMIX_sem_destroy(smx_sem_t sem)
XBT_OUT();
}
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
SIMIX_sem_release(sem);
}
/** @brief release the semaphore
@@
-463,7
+459,6
@@
void SIMIX_sem_release(smx_sem_t sem)
XBT_DEBUG("Sem release semaphore %p", sem);
if ((proc = xbt_swag_extract(sem->sleeping))) {
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_simcall_answer(&proc->simcall);
SIMIX_synchro_destroy(proc->waiting_action);
proc->waiting_action = NULL;
SIMIX_simcall_answer(&proc->simcall);
@@
-474,14
+469,14
@@
void SIMIX_sem_release(smx_sem_t sem)
}
/** @brief Returns true if acquiring this semaphore would block */
}
/** @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);
}
{
XBT_IN("(%p)",sem);
XBT_OUT();
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 */
return SIMIX_sem_get_capacity(sem);
}
/** @brief Returns the current capacity of the semaphore */
@@
-515,7
+510,7
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
* \brief Handles a sem acquire simcall without timeout.
* \param simcall the simcall
*/
* \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);
{
XBT_IN("(%p)",simcall);
_SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
@@
-526,9
+521,12
@@
void SIMIX_pre_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
* \brief Handles a sem acquire simcall with timeout.
* \param simcall the 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();
}
{
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);
+}