[email protected] (Ludovic Courtès) writes: > Hello, > > [email protected] (宋文武) skribis: > >> [email protected] (宋文武) writes: >> >>> [email protected] (Ludovic Courtès) writes: >>> >>>> Hello, >>>> >>>> Leo Famulari <[email protected]> skribis: >>>> >>>>> I just upgraded to the latest Guix and, while downloading substitutes, I >>>>> noticed the progress bar seems to never reach 100%, as shown below. I'm >>>>> not sure if this started recently or not. >>>>> >>>>> Downloading >>>>> https://mirror.hydra.gnu.org/guix/nar/gzip/drm4pj1k5mkb5784i0rkqb0bg2z8lmyw-libabw-0.1.1... >>>>> libabw-0.1.1 346KiB >>>> >>>> Indeed, I’ve noticed too, and I think it relates to the new progress >>>> reporters. 宋文武, do you experience this as well? Thoughts? >>>> >>> >>> Yes, thanks for the report, commit abaee53c8 should fix it. >>> >> >> Well, it didn't... I have to learn it's a child process will read and >> report the process: >> >> From 93b42f62ece1ad5181ed1119fc750bcbb74c5d3c Mon Sep 17 00:00:00 2001 >> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <[email protected]> >> Date: Sat, 14 Oct 2017 22:45:55 +0800 >> Subject: [PATCH] guix: substitute: Report the last process in the child >> process. >> >> Fixes <https://bugs.gnu.org/28756>. >> >> * guix/utils.scm (filtered-port): Close the 'input' port in the child >> process. >> * guix/scripts/substitute.scm (progress-substitution): Close the 'progress' >> port before 'restore-file'. > > [...] > >> + ;; A child process of 'decompressed-port' will read from this >> 'process' > > ^^^^^^^^^^^^^ > … will read from PROGRESS > >> + ;; port and thus report the actual progress to the console. As the >> + ;; parent process, we should close it at the start. >> + (close-port progress) >> ;; Unpack the Nar at INPUT into DESTINATION. >> (restore-file input destination) >> (close-port input) >> - (close-port progress) >> + (every (compose zero? cdr waitpid) pids) > > Since INPUT is a wrapper around PROGRESS, it seems weird to close > PROGRESS beforehand. > > Shouldn’t ‘filtered-port’ always close INPUT in the parent process (the > second part of the patch you sent closes it in the child process before > quitting, but we should additionally close it in the parent): >
Yes, it makes sense:
>From 6a3fa69f96fc2e3e074a9275066640ddfee57fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <[email protected]> Date: Sat, 14 Oct 2017 22:45:55 +0800 Subject: [PATCH] guix: substitute: Report the last progress in the child process. Fixes <https://bugs.gnu.org/28756>. * guix/utils.scm (filtered-port): Close the 'input' port for the current process, and close it upon exit in the child process. * guix/scripts/substitute.scm (progress-substitution): Display "\n\n" after the reporter has finished. --- guix/scripts/substitute.scm | 11 +++++++---- guix/utils.scm | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 921a7c679..60dbdb176 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -956,19 +956,22 @@ DESTINATION as a nar file. Verify the substitute against ACL." #:abbreviation nar-uri-abbreviation))) (progress-report-port reporter raw))) ((input pids) + ;; NOTE: This 'progress' port of current process will be + ;; closed here, while the child process doing the + ;; reporting will close it upon exit. (decompressed-port (and=> (narinfo-compression narinfo) string->symbol) progress))) ;; Unpack the Nar at INPUT into DESTINATION. (restore-file input destination) (close-port input) - (close-port progress) + + ;; Wait for the reporter to finish. + (every (compose zero? cdr waitpid) pids) ;; Skip a line after what 'progress-reporter/file' printed, and another ;; one to visually separate substitutions. - (display "\n\n" (current-error-port)) - - (every (compose zero? cdr waitpid) pids)))) + (display "\n\n" (current-error-port))))) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index de4aa6531..2cf9be36d 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -153,9 +153,11 @@ buffered data is lost." (close-port in) (dump-port input out)) (lambda () + (close-port input) (false-if-exception (close out)) (primitive-_exit 0)))) (child + (close-port input) (close-port out) (loop in (cons child pids))))))))) -- 2.13.3
Thanks for the help and review!
