diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-12-01 23:56:22 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-12-02 10:52:29 +0000 |
| commit | 80c17e9ba216d6376aba7ea9cef9246ebbf1f42b (patch) | |
| tree | fb0a757a72792b979ea956e047159bc258925e34 | |
| parent | d39997008751b5f8f5c2fc6fae42e44642fe6de5 (diff) | |
| download | build-coordinator-80c17e9ba216d6376aba7ea9cef9246ebbf1f42b.tar build-coordinator-80c17e9ba216d6376aba7ea9cef9246ebbf1f42b.tar.gz | |
Don't pass time to wait-condition-variable
My intent here was to avoid threads waiting indefinitely for a
signal. Unfortunately, it seems that specifying a timeout can result in
wait-condition-variable entering an endless loop internally (#67194).
Hopefully avoid this by not passing a time to wait-condition-variable. Maybe
some new threads/fibers will need adding that periodically signal these
condition variables to replicate the timeout behaviour.
| -rw-r--r-- | guix-build-coordinator/agent.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/coordinator.scm | 7 | ||||
| -rw-r--r-- | guix-build-coordinator/utils.scm | 12 |
3 files changed, 8 insertions, 14 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 568fcc8..1b19fd7 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -261,8 +261,7 @@ (begin (wait-condition-variable uploads-condition-variable - uploads-mutex - (+ 240 (time-second (current-time)))) + uploads-mutex) (loop)))))) diff --git a/guix-build-coordinator/coordinator.scm b/guix-build-coordinator/coordinator.scm index 5353fab..cece029 100644 --- a/guix-build-coordinator/coordinator.scm +++ b/guix-build-coordinator/coordinator.scm @@ -1069,8 +1069,6 @@ #:parallel? #t)) (define (start-hook-processing-threads build-coordinator parallel-hooks) - (define wait-timeout-seconds (* 60 5)) - (define datastore (build-coordinator-datastore build-coordinator)) @@ -1174,10 +1172,7 @@ (while #t (match (datastore-list-unprocessed-hook-events datastore event-name 1) (() - (wait-condition-variable condvar - mtx - (+ (time-second (current-time)) - wait-timeout-seconds))) + (wait-condition-variable condvar mtx)) (((id event arguments)) (process-event id event arguments handler))))) (lambda (key . args) diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm index afee6fc..84b4833 100644 --- a/guix-build-coordinator/utils.scm +++ b/guix-build-coordinator/utils.scm @@ -969,8 +969,7 @@ References: ~a~%" ;; #f from wait-condition-variable indicates a timeout (if (wait-condition-variable job-available - queue-mutex - (+ 9 (time-second (current-time)))) + queue-mutex) ;; Another thread could have taken ;; the job in the mean time (if (q-empty? queue) @@ -1142,8 +1141,7 @@ References: ~a~%" ;; #f from wait-condition-variable indicates a timeout (if (wait-condition-variable job-available - pool-mutex - (+ 60 (time-second (current-time)))) + pool-mutex) (get-job running-jobs) #f)))) (if job-args @@ -1218,10 +1216,12 @@ References: ~a~%" (when (= 0 idle-threads) (start-new-threads-if-necessary (get-thread-count)))) + ;; Wake a worker thread to check if a job is available + (signal-condition-variable job-available) + (wait-condition-variable job-available - pool-mutex - (+ 60 (time-second (current-time))))) + pool-mutex)) #:unwind? #t)))) (start-new-threads-if-necessary (get-thread-count))) |