From: Christopher Baines <mail@cbaines.net>
To: 34638@debbugs.gnu.org
Subject: [bug#34638] [PATCH 3/4] inferior: Add a shared-directory field to <inferior>
Date: Sun, 24 Feb 2019 16:18:54 +0000 [thread overview]
Message-ID: <20190224161855.2632-3-mail@cbaines.net> (raw)
In-Reply-To: <20190224161855.2632-1-mail@cbaines.net>
---
guix/inferior.scm | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/guix/inferior.scm b/guix/inferior.scm
index 027418a98d..cf72454426 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -97,14 +97,15 @@
;; Inferior Guix process.
(define-record-type <inferior>
- (inferior pid socket close version packages table)
+ (inferior pid socket close shared-directory version packages table)
inferior?
- (pid inferior-pid)
- (socket inferior-socket)
- (close inferior-close-socket) ;procedure
- (version inferior-version) ;REPL protocol version
- (packages inferior-package-promise) ;promise of inferior packages
- (table inferior-package-table)) ;promise of vhash
+ (pid inferior-pid)
+ (socket inferior-socket)
+ (close inferior-close-socket) ;procedure
+ (shared-directory inferior-shared-directory)
+ (version inferior-version) ;REPL protocol version
+ (packages inferior-package-promise) ;promise of inferior packages
+ (table inferior-package-table)) ;promise of vhash
(define (inferior-pipe directory command)
"Return an input/output pipe on the Guix instance in DIRECTORY. This runs
@@ -136,7 +137,7 @@ it's an old Guix."
((@ (guix scripts repl) machine-repl))))))
pipe)))
-(define* (port->inferior pipe #:optional (close close-port))
+(define* (port->inferior pipe shared-directory #:optional (close close-port))
"Given PIPE, an input/output port, return an inferior that talks over PIPE.
PIPE is closed with CLOSE when 'close-inferior' is called on the returned
inferior."
@@ -144,7 +145,8 @@ inferior."
(match (read pipe)
(('repl-version 0 rest ...)
- (letrec ((result (inferior 'pipe pipe close (cons 0 rest)
+ (letrec ((result (inferior 'pipe pipe close shared-directory
+ (cons 0 rest)
(delay (%inferior-packages result))
(delay (%inferior-package-table result)))))
(inferior-eval '(use-modules (guix)) result)
@@ -162,7 +164,7 @@ equivalent. Return #f if the inferior could not be launched."
(define pipe
(inferior-pipe directory command))
- (port->inferior pipe close-pipe))
+ (port->inferior pipe #f close-pipe))
(define (close-inferior inferior)
"Close INFERIOR."
@@ -479,7 +481,8 @@ thus be the code of a one-argument procedure that accepts a store."
((client . address)
(proxy client (store-connection-socket store))))
(close-port socket)
- (read-inferior-response inferior)))))
+ (read-inferior-response inferior)))
+ #:base-directory (inferior-shared-directory inferior)))
(define* (inferior-package-derivation store package
#:optional
--
2.20.1
next prev parent reply other threads:[~2019-02-24 16:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 16:12 [bug#34638] [PATCH 0/4] Isolated inferiors Christopher Baines
2019-02-24 16:18 ` [bug#34638] [PATCH 1/4] utils: Add #:base-directory to call-with-temporary-directory Christopher Baines
2019-02-24 16:18 ` [bug#34638] [PATCH 2/4] linux-container: Add 'start-child-in-container' Christopher Baines
2019-03-14 18:17 ` Ludovic Courtès
2019-04-19 14:16 ` Christopher Baines
2019-02-24 16:18 ` Christopher Baines [this message]
2019-02-24 16:18 ` [bug#34638] [PATCH 4/4] inferior: Add 'open-inferior/container' Christopher Baines
2019-03-14 19:35 ` [bug#34638] [PATCH 0/4] Isolated inferiors Ludovic Courtès
2019-04-19 14:04 ` [bug#34638] [PATCH v2 1/4] utils: Add #:base-directory to call-with-temporary-directory Christopher Baines
2019-04-19 14:04 ` [bug#34638] [PATCH v2 2/4] linux-container: Add 'start-child-in-container' Christopher Baines
2020-03-26 9:28 ` Ludovic Courtès
2020-03-28 11:26 ` Christopher Baines
2020-03-28 12:20 ` Ludovic Courtès
2019-04-19 14:04 ` [bug#34638] [PATCH v2 3/4] inferior: Add a shared-directory field to <inferior> Christopher Baines
2020-03-26 9:30 ` Ludovic Courtès
2019-04-19 14:04 ` [bug#34638] [PATCH v2 4/4] inferior: Add 'open-inferior/container' Christopher Baines
2020-03-26 9:32 ` Ludovic Courtès
2020-03-26 9:22 ` [bug#34638] [PATCH v2 1/4] utils: Add #:base-directory to call-with-temporary-directory Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190224161855.2632-3-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=34638@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).