Actually reset the state of the reusable-condition

Also export reusable-condition?

1 files changed, 16 insertions, 10 deletions

diff --git a/guix-build-coordinator/utils/fibers.scm b/guix-build-coordinator/utils/fibers.scm
index c34ef69..776c470 100644
--- a/guix-build-coordinator/utils/fibers.scm
+++ b/guix-build-coordinator/utils/fibers.scm
@@ -22,6 +22,7 @@
             make-discrete-priority-queueing-channels
 
             make-reusable-condition
+            reusable-condition?
             signal-reusable-condition!
             reusable-condition-wait)
   #:replace (retry-on-error))
@@ -128,13 +129,18 @@
 
 (define* (reusable-condition-wait reusable-condition
                                   #:key (timeout #f))
-  (if (atomic-box-ref (reusable-condition-atomic-box reusable-condition))
-      #t
-      ;; Not great as this is subject to race conditions, but it should
-      ;; roughly work
-      (if timeout
-          (perform-operation
-           (choice-operation
-            (get-operation (reusable-condition-channel reusable-condition))
-            (sleep-operation timeout)))
-          (get-message (reusable-condition-channel reusable-condition)))))
+  (let ((val
+         (if (atomic-box-ref (reusable-condition-atomic-box reusable-condition))
+             #t
+             ;; Not great as this is subject to race conditions, but it should
+             ;; roughly work
+             (if timeout
+                 (perform-operation
+                  (choice-operation
+                   (get-operation (reusable-condition-channel reusable-condition))
+                   (wrap-operation (sleep-operation timeout)
+                                   (const #f))))
+                 (get-message (reusable-condition-channel reusable-condition))))))
+    (atomic-box-set! (reusable-condition-atomic-box reusable-condition)
+                     #f)
+    val))