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 dist
[simgrid.git]
/
src
/
s4u
/
s4u_conditionVariable.cpp
diff --git
a/src/s4u/s4u_conditionVariable.cpp
b/src/s4u/s4u_conditionVariable.cpp
index
3200255
..
3074f12
100644
(file)
--- a/
src/s4u/s4u_conditionVariable.cpp
+++ b/
src/s4u/s4u_conditionVariable.cpp
@@
-25,6
+25,10
@@
void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
}
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
}
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
+ // The simcall uses -1 for "any timeout" but we don't want this:
+ if (timeout < 0)
+ timeout = 0.0;
+
try {
simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
return std::cv_status::no_timeout;
try {
simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
return std::cv_status::no_timeout;