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
Reinitialize waiting_action at proper place.
[simgrid.git]
/
src
/
simix
/
smx_user.c
diff --git
a/src/simix/smx_user.c
b/src/simix/smx_user.c
index
c0198ab
..
8c08f25
100644
(file)
--- a/
src/simix/smx_user.c
+++ b/
src/simix/smx_user.c
@@
-1079,8
+1079,6
@@
void simcall_cond_wait_timeout(smx_cond_t cond,
smx_mutex_t mutex,
double timeout)
{
smx_mutex_t mutex,
double timeout)
{
- xbt_ex_t e;
-
xbt_assert(isfinite(timeout), "timeout is not finite!");
smx_simcall_t simcall = SIMIX_simcall_mine();
xbt_assert(isfinite(timeout), "timeout is not finite!");
smx_simcall_t simcall = SIMIX_simcall_mine();
@@
-1090,20
+1088,7
@@
void simcall_cond_wait_timeout(smx_cond_t cond,
simcall->cond_wait_timeout.mutex = mutex;
simcall->cond_wait_timeout.timeout = timeout;
simcall->cond_wait_timeout.mutex = mutex;
simcall->cond_wait_timeout.timeout = timeout;
- TRY {
- SIMIX_simcall_push(simcall->issuer);
- }
- CATCH(e) {
- switch (e.category) {
- case timeout_error:
- simcall->issuer->waiting_action = NULL; // FIXME: should clean ?
- break;
- default:
- break;
- }
- RETHROW;
- xbt_ex_free(e);
- }
+ SIMIX_simcall_push(simcall->issuer);
}
void simcall_cond_broadcast(smx_cond_t cond)
}
void simcall_cond_broadcast(smx_cond_t cond)