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
Stop using costly exceptions on timeout for simix synchros.
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
f961a2c
..
24f8636
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-13,11
+13,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_actor_t issuer, smx_simcall_t simcall);
-static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
- smx_simcall_t simcall);
-
/***************************** Raw synchronization *********************************/
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
/***************************** Raw synchronization *********************************/
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
@@
-47,6
+42,7
@@
void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
case SIMCALL_COND_WAIT_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
case SIMCALL_COND_WAIT_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process);
+ simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout
break;
case SIMCALL_SEM_ACQUIRE:
break;
case SIMCALL_SEM_ACQUIRE:
@@
-55,6
+51,7
@@
void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall)
case SIMCALL_SEM_ACQUIRE_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
case SIMCALL_SEM_ACQUIRE_TIMEOUT:
simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process);
+ simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout
break;
default:
break;
default:
@@
-69,19
+66,11
@@
void SIMIX_synchro_finish(smx_activity_t synchro)
smx_simcall_t simcall = synchro->simcalls.front();
synchro->simcalls.pop_front();
smx_simcall_t simcall = synchro->simcalls.front();
synchro->simcalls.pop_front();
- switch (synchro->state) {
-
- case SIMIX_SRC_TIMEOUT:
- SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Synchro's wait timeout");
- break;
-
- case SIMIX_FAILED:
- simcall->issuer->context->iwannadie = 1;
- break;
-
- default:
+ if (synchro->state != SIMIX_SRC_TIMEOUT) {
+ if (synchro->state == SIMIX_FAILED)
+ simcall->issuer->context->iwannadie = 1;
+ else
THROW_IMPOSSIBLE;
THROW_IMPOSSIBLE;
- break;
}
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
}
SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
@@
-170,7
+159,6
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer,
/**
* \brief Handles a sem acquire simcall without timeout.
/**
* \brief Handles a sem acquire simcall without timeout.
- * \param simcall the simcall
*/
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
*/
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
{
@@
-181,11
+169,11
@@
void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
/**
* \brief Handles a sem acquire simcall with timeout.
/**
* \brief Handles a sem acquire simcall with timeout.
- * \param simcall the simcall
*/
void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
XBT_IN("(%p)",simcall);
*/
void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
{
XBT_IN("(%p)",simcall);
+ simcall_sem_acquire_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
_SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}
_SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall);
XBT_OUT();
}