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
/
msg
/
msg_synchro.cpp
diff --git
a/src/msg/msg_synchro.cpp
b/src/msg/msg_synchro.cpp
index
a1e4886
..
c2895a3
100644
(file)
--- a/
src/msg/msg_synchro.cpp
+++ b/
src/msg/msg_synchro.cpp
@@
-29,15
+29,7
@@
void MSG_sem_acquire(msg_sem_t sem) {
/** @brief locks on a semaphore object up until the provided timeout expires */
msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
/** @brief locks on a semaphore object up until the provided timeout expires */
msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
- msg_error_t res = MSG_OK;
- try {
- simcall_sem_acquire_timeout(sem,timeout);
- } catch(xbt_ex& e) {
- if (e.category == timeout_error)
- return MSG_TIMEOUT;
- throw;
- }
- return res;
+ return simcall_sem_acquire_timeout(sem, timeout) ? MSG_TIMEOUT : MSG_OK;
}
/** @brief releases the semaphore object */
}
/** @brief releases the semaphore object */