me
/
guix
Archived
1
0
Fork 0
Code

store: Refactor connect-to-daemon. 

Remove the inner connect procedure, as now that #:non-blocking? needs passing
on, this just makes things more difficult.  This commit also fixes not passing
 #:non-blocking? on in the case where open-unix-domain-socket is called as
connect.

* guix/store.scm (connect-to-daemon): Refactor and fix non-blocking
connections to sockets with a filename.

Change-Id: I61cd99920df91baba95567d670bec6fa94043875
master
Christopher Baines 2024-05-14 17:56:05 +01:00
parent 56770f7d59
commit ffdbf1f11e
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
guix/store.scm
View File

@ -524,33 +524,31 @@ non-blocking."
(errno (system-error-errno args)))))
(loop rest)))))))))
(define* (connect-to-daemon uri #:key non-blocking?)
"Connect to the daemon at URI, a string that may be an actual URI or a file
name, and return an input/output port. If NON-BLOCKING?, use a non-blocking
socket when using the file, unix or guix URI schemes.
(define* (connect-to-daemon uri-or-filename #:key non-blocking?)
"Connect to the daemon at URI-OR-FILENAME and return an input/output port.
If NON-BLOCKING?, use a non-blocking socket when using the file, unix or guix
URI schemes.
This is a low-level procedure that does not perform the initial handshake with
the daemon. Use 'open-connection' for that."
(define (not-supported)
(raise (condition (&store-connection-error
(file uri)
(file uri-or-filename)
(errno ENOTSUP)))))
(define connect
(match (string->uri uri)
(match (string->uri uri-or-filename)
(#f ;URI is a file name
open-unix-domain-socket)
(open-unix-domain-socket uri-or-filename
#:non-blocking? non-blocking?))
((? uri? uri)
(match (uri-scheme uri)
((or #f 'file 'unix)
(lambda (_)
(open-unix-domain-socket (uri-path uri)
#:non-blocking? non-blocking?)))
#:non-blocking? non-blocking?))
('guix
(lambda (_)
(open-inet-socket (uri-host uri)
(or (uri-port uri) %default-guix-port)
#:non-blocking? non-blocking?)))
#:non-blocking? non-blocking?))
((? symbol? scheme)
;; Try to dynamically load a module for SCHEME.
;; XXX: Errors are swallowed.
@ -560,15 +558,12 @@ the daemon. Use 'open-connection' for that."
(match (false-if-exception
(module-ref module 'connect-to-daemon))
((? procedure? connect)
(lambda (_)
(connect uri)))
(connect uri))
(x (not-supported))))
(#f (not-supported))))
(x
(not-supported))))))
(connect uri))
(define* (open-connection #:optional (uri (%daemon-socket-uri))
#:key port (reserve-space? #t) cpu-affinity
non-blocking?)