From e92ead61dede9c7ccb3e5fc5a889f762e9ded744 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Thu, 21 Jul 2016 12:05:49 +0200 Subject: [PATCH 1/1] [s4u] Don't handle -1 specially in ConditionVariable::wait_for() --- src/s4u/s4u_conditionVariable.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp index 3200255209..3074f1253d 100644 --- a/src/s4u/s4u_conditionVariable.cpp +++ b/src/s4u/s4u_conditionVariable.cpp @@ -25,6 +25,10 @@ void ConditionVariable::wait(std::unique_lock& lock) { } std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock& 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; -- 2.20.1