SERVER-25062 Fix return types of predicated waits and notification waitFor.

This patch makes the return types of predicated waits on condition variables
and Notification::waitFor look more like the corresponding functions in C++
standard types.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/util/concurrency/notification.h b/src/mongo/util/concurrency/notification.h
index 091dca02a60..aa8df252110 100644
--- a/src/mongo/util/concurrency/notification.h
+++ b/src/mongo/util/concurrency/notification.h
@@ -100,12 +100,10 @@ public:
      * If the notification is not set, blocks either until it becomes set or until the waitTimeout
      * expires. If the wait is interrupted, throws an exception. Otherwise, returns immediately.
      */
-    bool waitFor(OperationContext* opCtx, Microseconds waitTimeout) {
-        const auto waitDeadline = Date_t::now() + waitTimeout;
-
+    bool waitFor(OperationContext* opCtx, Milliseconds waitTimeout) {
         stdx::unique_lock<stdx::mutex> lock(_mutex);
-        return _condVar.wait_until(
-            lock, waitDeadline.toSystemTimePoint(), [&]() { return !!_value; });
+        return opCtx->waitForConditionOrInterruptFor(
+            _condVar, lock, waitTimeout, [&]() { return !!_value; });
     }
 
 private:
@@ -135,7 +133,7 @@ public:
         _notification.set(true);
     }
 
-    bool waitFor(OperationContext* opCtx, Microseconds waitTimeout) {
+    bool waitFor(OperationContext* opCtx, Milliseconds waitTimeout) {
         return _notification.waitFor(opCtx, waitTimeout);
     }