me
/
guix
Archived
1
0
Fork 0
Code

inferior: Use the host built-in-builders with inferior. 

Rather than querying the built-in-builders from the inferior, as using the
host value allows specifying it when opening the connection.

* guix/inferior.scm (port->inferior): Have cached-store-connection take the
built-in-builders.
(inferior-eval-with-store): Call cached-store-connection with the store
connection built-in-builders.

Change-Id: I27c20732355c0c6aa646748a02df39db302cd568
master
Christopher Baines 2024-07-16 09:04:57 +01:00
parent d82ac48b07
commit f3e17f9ff1
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
guix/inferior.scm
View File

@ -253,7 +253,8 @@ inferior."
result)
(inferior-eval '(begin
(define %store-table (make-hash-table))
(define (cached-store-connection store-id version)
(define (cached-store-connection store-id version
built-in-builders)
;; Cache connections to store ID. This ensures that
;; the caches within <store-connection> (in
;; particular the object cache) are reused across
@ -268,9 +269,19 @@ inferior."
;; risk of talking to the wrong daemon or having
;; our build result reclaimed (XXX).
(let ((store (if (defined? 'port->connection)
(port->connection %bridge-socket
#:version
version)
;; #:built-in-builders was
;; added in 2024
(catch 'keyword-argument-error
(lambda ()
(port->connection %bridge-socket
#:version
version
#:built-in-builders
built-in-builders))
(lambda _
(port->connection %bridge-socket
#:version
version)))
(open-connection))))
(hashv-set! %store-table store-id store)
store))))
@ -690,11 +701,13 @@ thus be the code of a one-argument procedure that accepts a store."
;; The address of STORE itself is not a good identifier because it
;; keeps changing through the use of "functional caches". The
;; address of its socket port makes more sense.
(store-id (object-address (store-connection-socket store))))
(store-id (object-address (store-connection-socket store)))
(store-built-in-builders (built-in-builders store)))
(ensure-store-bridge! inferior)
(send-inferior-request
`(let ((proc ,code)
(store (cached-store-connection ,store-id ,proto)))
(store (cached-store-connection ,store-id ,proto
',store-built-in-builders)))
;; Serialize '&store-protocol-error' conditions. The exception
;; serialization mechanism that 'read-repl-response' expects is
;; unsuitable for SRFI-35 error conditions, hence this special case.