From patchwork Fri May 21 08:27:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 29442 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 0AEBB27BC81; Fri, 21 May 2021 09:28:12 +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 D29D427BC78 for ; Fri, 21 May 2021 09:28:11 +0100 (BST) Received: from localhost ([::1]:57800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk0Vv-0005yq-1Y for patchwork@mira.cbaines.net; Fri, 21 May 2021 04:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk0Vn-0005wr-Gu for guix-patches@gnu.org; Fri, 21 May 2021 04:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lk0Vn-0005Oo-9Q for guix-patches@gnu.org; Fri, 21 May 2021 04:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lk0Vn-00062V-6f for guix-patches@gnu.org; Fri, 21 May 2021 04:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48558] [PATCH 3/4] progress: Add a download-size argument to progress-report-port. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 May 2021 08:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48558 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48558@debbugs.gnu.org Cc: Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162158565223150 (code B ref -1); Fri, 21 May 2021 08:28:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2021 08:27:32 +0000 Received: from localhost ([127.0.0.1]:35740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk0VI-00061J-1t for submit@debbugs.gnu.org; Fri, 21 May 2021 04:27:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:44362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk0VF-000610-VJ for submit@debbugs.gnu.org; Fri, 21 May 2021 04:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk0VF-0005JB-Ku for guix-patches@gnu.org; Fri, 21 May 2021 04:27:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36138) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk0VE-00053e-Am for guix-patches@gnu.org; Fri, 21 May 2021 04:27:29 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=37126 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 1lk0VB-0003nM-PO; Fri, 21 May 2021 04:27:26 -0400 From: Mathieu Othacehe Date: Fri, 21 May 2021 10:27:12 +0200 Message-Id: <20210521082713.20169-3-othacehe@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521082713.20169-1-othacehe@gnu.org> References: <20210521082713.20169-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/progress.scm (progress-report-port): Add a download-size argument. --- guix/progress.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/guix/progress.scm b/guix/progress.scm index 334bd40547..0cbc804ec1 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -347,15 +347,25 @@ should be a object." (report total) (loop total (get-bytevector-n! in buffer 0 buffer-size)))))))) -(define* (progress-report-port reporter port #:key (close? #t)) +(define* (progress-report-port reporter port + #:key + (close? #t) + download-size) "Return a port that continuously reports the bytes read from PORT using REPORTER, which should be a object. When CLOSE? is true, -PORT is closed when the returned port is closed." +PORT is closed when the returned port is closed. + +When DOWNLOAD-SIZE is passed, do not read more than DOWNLOAD-SIZE bytes from +PORT. This is important to avoid blocking when the remote side won't close +the underlying connection." (match reporter (($ start report stop) (let* ((total 0) (read! (lambda (bv start count) - (let ((n (match (get-bytevector-n! port bv start count) + (let* ((count (if download-size + (min count (- download-size total)) + count)) + (n (match (get-bytevector-n! port bv start count) ((? eof-object?) 0) (x x)))) (set! total (+ total n))