Update Guile Knots

This commit is contained in:
Christopher Baines 2025-01-14 13:49:28 +00:00
parent d6cfd780e8
commit c886685e92
3 changed files with 9 additions and 48 deletions

View file

@ -42,9 +42,9 @@
#:use-module (knots)
#:use-module (knots queue)
#:use-module (knots promise)
#:use-module (knots thread-pool)
#:use-module (knots parallelism)
#:use-module (knots resource-pool)
#:use-module (knots worker-threads)
#:use-module (guix monads)
#:use-module (guix base32)
#:use-module (guix store)
@ -2271,19 +2271,17 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
#:key skip-system-tests? parallelism
extra-inferior-environment-variables)
(define call-with-utility-thread
(let* ((worker-thread-set
(let* ((thread-pool
(call-with-default-io-waiters
(lambda ()
(make-worker-thread-set
(const '())
#:parallelism parallelism))))
(make-thread-pool parallelism))))
(queued-channel
;; There might be high demand for this, so order the requests
(spawn-queueing-fiber
(worker-thread-set-channel worker-thread-set))))
(thread-pool-channel thread-pool))))
(lambda (thunk)
(call-with-worker-thread
worker-thread-set
(call-with-thread
thread-pool
thunk
#:channel queued-channel))))
@ -2804,7 +2802,7 @@ SKIP LOCKED")
;; instances have the data updated.
(fix-derivation-output-details-hash-encoding conn)
(%worker-thread-default-timeout #f)
(%thread-pool-default-timeout #f)
(resource-pool-retry-checkout-timeout 120)