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
Fix initialization order.
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
2c1b53b
..
eebc903
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
-2013
. 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,14
+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);
+
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 =
- surf_workstation_
model->extension.workstation.sleep(smx_host->
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_OUT();
return action;
}
@@
-41,23
+42,23
@@
void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall)
switch (simcall->call) {
case SIMCALL_MUTEX_LOCK:
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:
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:
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:
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:
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:
break;
default:
@@
-70,7
+71,8
@@
void SIMIX_synchro_destroy(smx_action_t action)
{
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", 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();
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
@@
-79,9
+81,10
@@
void SIMIX_synchro_destroy(smx_action_t action)
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
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;
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);
action->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(action);
@@
-100,7
+103,8
@@
static void SIMIX_synchro_finish(smx_action_t action)
break;
case SIMIX_FAILED:
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:
break;
default:
@@
-116,6
+120,9
@@
static void SIMIX_synchro_finish(smx_action_t action)
}
/*********************************** Mutex ************************************/
}
/*********************************** Mutex ************************************/
+smx_mutex_t SIMIX_pre_mutex_init(smx_simcall_t simcall){
+ return SIMIX_mutex_init();
+}
/**
* \brief Initialize a mutex.
*
/**
* \brief Initialize a mutex.
*
@@
-138,12
+145,11
@@
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)
+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;
{
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) {
smx_process_t process = simcall->issuer;
if (mutex->locked) {
@@
-162,6
+168,9
@@
void SIMIX_pre_mutex_lock(smx_simcall_t simcall)
XBT_OUT();
}
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.
*
/**
* \brief Tries to lock a mutex.
*
@@
-185,6
+194,9
@@
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){
+ SIMIX_mutex_unlock(mutex, simcall->issuer);
+}
/**
* \brief Unlocks a mutex.
*
/**
* \brief Unlocks a mutex.
*
@@
-219,6
+231,9
@@
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){
+ SIMIX_mutex_destroy(mutex);
+}
/**
* \brief Destroys a mutex.
*
/**
* \brief Destroys a mutex.
*
@@
-237,6
+252,9
@@
void SIMIX_mutex_destroy(smx_mutex_t mutex)
/********************************* Condition **********************************/
/********************************* Condition **********************************/
+smx_cond_t SIMIX_pre_cond_init(smx_simcall_t simcall){
+ return SIMIX_cond_init();
+}
/**
* \brief Initialize a condition.
*
/**
* \brief Initialize a condition.
*
@@
-244,7
+262,7
@@
void SIMIX_mutex_destroy(smx_mutex_t mutex)
* It have to be called before the use of the condition.
* \return 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;
{
XBT_IN("()");
s_smx_process_t p;
@@
-259,12
+277,10
@@
smx_cond_t SIMIX_cond_init()
* \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)
+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;
{
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();
_SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
XBT_OUT();
@@
-274,13
+290,11
@@
void SIMIX_pre_cond_wait(smx_simcall_t simcall)
* \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)
+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;
{
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();
_SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
XBT_OUT();
@@
-309,6
+323,9
@@
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){
+ SIMIX_cond_signal(cond);
+}
/**
* \brief Signalizes a condition.
*
/**
* \brief Signalizes a condition.
*
@@
-336,18
+353,19
@@
void SIMIX_cond_signal(smx_cond_t cond)
/* Now transform the cond wait simcall into a mutex lock one */
simcall = &proc->simcall;
if(simcall->call == SIMCALL_COND_WAIT)
/* 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
else
- mutex = simcall->cond_wait_timeout.mutex;
-
+ mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall->call = SIMCALL_MUTEX_LOCK;
simcall->call = SIMCALL_MUTEX_LOCK;
- simcall->mutex_lock.mutex = mutex;
- SIMIX_pre_mutex_lock(simcall);
+ SIMIX_pre_mutex_lock(simcall
, mutex
);
}
XBT_OUT();
}
}
XBT_OUT();
}
+void SIMIX_pre_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
+ SIMIX_cond_broadcast(cond);
+}
/**
* \brief Broadcasts a condition.
*
/**
* \brief Broadcasts a condition.
*
@@
-367,6
+385,9
@@
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){
+ SIMIX_cond_destroy(cond);
+}
/**
* \brief Destroys a contidion.
*
/**
* \brief Destroys a contidion.
*
@@
-390,6
+411,9
@@
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){
+ return SIMIX_sem_init(value);
+}
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
@@
-403,6
+427,9
@@
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){
+ SIMIX_sem_destroy(sem);
+}
/** @brief Destroys a semaphore */
void SIMIX_sem_destroy(smx_sem_t sem)
{
/** @brief Destroys a semaphore */
void SIMIX_sem_destroy(smx_sem_t sem)
{
@@
-417,6
+444,9
@@
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){
+ SIMIX_sem_release(sem);
+}
/** @brief release the semaphore
*
* Unlock a process waiting on the semaphore.
/** @brief release the semaphore
*
* Unlock a process waiting on the semaphore.
@@
-429,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);
@@
-440,13
+469,16
@@
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){
+ return SIMIX_sem_get_capacity(sem);
+}
/** @brief Returns the current capacity of the semaphore */
int SIMIX_sem_get_capacity(smx_sem_t sem)
{
/** @brief Returns the current capacity of the semaphore */
int SIMIX_sem_get_capacity(smx_sem_t sem)
{
@@
-478,10
+510,10
@@
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)
+void SIMIX_pre_sem_acquire(smx_simcall_t simcall
, smx_sem_t sem
)
{
XBT_IN("(%p)",simcall);
{
XBT_IN("(%p)",simcall);
- _SIMIX_sem_wait(s
imcall->sem_acquire.s
em, -1, simcall->issuer, simcall);
+ _SIMIX_sem_wait(sem, -1, simcall->issuer, simcall);
XBT_OUT();
}
XBT_OUT();
}
@@
-489,10
+521,9
@@
void SIMIX_pre_sem_acquire(smx_simcall_t simcall)
* \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)
+void SIMIX_pre_sem_acquire_timeout(smx_simcall_t simcall
, smx_sem_t sem, double timeout
)
{
XBT_IN("(%p)",simcall);
{
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();
}
XBT_OUT();
}