From patchwork Fri Apr 19 14:04:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1434C16ECD; Fri, 19 Apr 2019 15:10:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B98416EC9 for ; Fri, 19 Apr 2019 15:10:11 +0100 (BST) Received: from localhost ([127.0.0.1]:57075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUDT-0000VF-0D for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:10:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8a-0004am-Cd for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8W-0005li-E7 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59110) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8U-0005gg-A5 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8U-0002S8-0I for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 3/4] inferior: Add a shared-directory field to Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826719366 (code B ref 34638); Fri, 19 Apr 2019 14:05:01 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:31 +0000 Received: from localhost ([127.0.0.1]:44414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7z-0002Qy-1D for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:31 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7w-0002QU-UD for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:29 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id B44D016ED2 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e6a8908b for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:26 +0100 Message-Id: <20190419140427.15183-3-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419140427.15183-1-mail@cbaines.net> References: <20190419140427.15183-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- guix/inferior.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 63c95141d7..6d18ab90e9 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -97,14 +97,15 @@ ;; Inferior Guix process. (define-record-type - (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