From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 21 Jul 2016 10:05:49 +0000 (+0200)
Subject: [s4u] Don't handle -1 specially in ConditionVariable::wait_for()
X-Git-Tag: v3_14~737^2~3
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e92ead61dede9c7ccb3e5fc5a889f762e9ded744?ds=inline

[s4u] Don't handle -1 specially in ConditionVariable::wait_for()
---

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<Mutex>& lock) {
 }
 
 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;