From patchwork Fri May 21 08:32:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 29446 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 5F64427BC81; Fri, 21 May 2021 09:34:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28FD327BC78 for ; Fri, 21 May 2021 09:34:17 +0100 (BST) Received: from localhost ([::1]:60682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk0bo-0008KA-Df for patchwork@mira.cbaines.net; Fri, 21 May 2021 04:34:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk0ad-0007vC-7W for guix-patches@gnu.org; Fri, 21 May 2021 04:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lk0ac-0008M6-VX for guix-patches@gnu.org; Fri, 21 May 2021 04:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lk0ac-0006E9-TZ for guix-patches@gnu.org; Fri, 21 May 2021 04:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48556] [PATCH 4/4] scripts: substitute: Add keep-alive support when reading NAR. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 May 2021 08:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48556 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48556@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 48556-submit@debbugs.gnu.org id=B48556.162158595823881 (code B ref 48556); Fri, 21 May 2021 08:33:02 +0000 Received: (at 48556) by debbugs.gnu.org; 21 May 2021 08:32:38 +0000 Received: from localhost ([127.0.0.1]:35790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk0aD-0006D2-NM for submit@debbugs.gnu.org; Fri, 21 May 2021 04:32:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk0aA-0006CH-ET for 48556@debbugs.gnu.org; Fri, 21 May 2021 04:32:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36246) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk0a5-00080i-8u for 48556@debbugs.gnu.org; Fri, 21 May 2021 04:32:29 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=37202 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lk0a3-0004xH-0b; Fri, 21 May 2021 04:32:28 -0400 From: Mathieu Othacehe Date: Fri, 21 May 2021 10:32:19 +0200 Message-Id: <20210521083219.20714-4-othacehe@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521083219.20714-1-othacehe@gnu.org> References: <20210521083219.20714-1-othacehe@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/scripts/substitute.scm (process-substitution): Pass the download size to the progress-report-port procedure so that it doesn't block reading from the input port when keep-alive is supported. --- guix/scripts/substitute.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 8e4eae00b3..54311c3e08 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -518,8 +518,11 @@ PORT." (current-error-port) #:abbreviation nar-uri-abbreviation)))) ;; Keep RAW open upon completion so we can later reuse - ;; the underlying connection. - (progress-report-port reporter raw #:close? #f))) + ;; the underlying connection. Pass the download size so + ;; that this procedure won't block reading from RAW. + (progress-report-port reporter raw + #:close? #f + #:download-size dl-size))) ((input pids) ;; NOTE: This 'progress' port of current process will be ;; closed here, while the child process doing the