From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Luke Mewburn <luke@mewburn.net>
Subject: Re: [PATCH 2/5] progress: return early when in the background
Date: Mon, 25 Mar 2019 12:08:47 +0100 [thread overview]
Message-ID: <8736nbcitc.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20190325103844.26749-3-szeder.dev@gmail.com>
On Mon, Mar 25 2019, SZEDER Gábor wrote:
> When a git process runs in the background, it doesn't display
> progress, only the final "done" line [1]. The condition to check that
> are a bit too deep in the display() function, and thus it calculates
> the progress percentage even when no progress will be displayed
> anyway.
>
> Restructure the display() function to return early when we are in the
> background, which prevents the unnecessary progress percentae
> calculation, and make the function look a bit better by losing one
> level of indentation.
>
> [1] 85cb8906f0 (progress: no progress in background, 2015-04-13)
CC-ing the author of that patch.
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
> progress.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/progress.c b/progress.c
> index 02a20e7d58..b57c0dae16 100644
> --- a/progress.c
> +++ b/progress.c
> @@ -86,28 +86,30 @@ static void display(struct progress *progress, uint64_t n, const char *done)
> return;
>
> progress->last_value = n;
> +
> + if (!is_foreground_fd(fileno(stderr)) && !done) {
> + progress_update = 0;
> + return;
> + }
> +
> tp = (progress->throughput) ? progress->throughput->display.buf : "";
> eol = done ? done : " \r";
> if (progress->total) {
> unsigned percent = n * 100 / progress->total;
> if (percent != progress->last_percent || progress_update) {
> progress->last_percent = percent;
> - if (is_foreground_fd(fileno(stderr)) || done) {
> - fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s",
> - progress->title, percent,
> - (uintmax_t)n, (uintmax_t)progress->total,
> - tp, eol);
> - fflush(stderr);
> - }
> + fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s",
> + progress->title, percent,
> + (uintmax_t)n, (uintmax_t)progress->total,
> + tp, eol);
> + fflush(stderr);
> progress_update = 0;
> return;
> }
> } else if (progress_update) {
> - if (is_foreground_fd(fileno(stderr)) || done) {
> - fprintf(stderr, "%s: %"PRIuMAX"%s%s",
> - progress->title, (uintmax_t)n, tp, eol);
> - fflush(stderr);
> - }
> + fprintf(stderr, "%s: %"PRIuMAX"%s%s",
> + progress->title, (uintmax_t)n, tp, eol);
> + fflush(stderr);
> progress_update = 0;
> return;
> }
This patch looks good, just notes for potential follow-up:
* Is the "is_foreground_fd(fileno(stderr))" case worth moving into
start_progress_delay() & setting a variable? It's a few C lib calls &
potential syscall (getpid(...)).
* Is that "|| done" part in the "progress_update" case something that
needs to happen? I.e. can we entirely skip the "setup signal handler"
part in start_progress_delay() if we detect that we're not in the
foreground, and then rely on the stop_progress() call to print the
"done"?
Although we set "progress_update = 1" in stop_progress_msg(), so it's
not *just* the signal handler but also us "faking" it, and we'd still
need to stash away "progress->last_value = n" in display() in that
backgrounding case.
So maybe it's as simple as it's going to get.
next prev parent reply other threads:[~2019-03-25 11:08 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-25 10:38 [PATCH 0/5] Progress display fixes SZEDER Gábor
2019-03-25 10:38 ` [PATCH 1/5] progress: make display_progress() return void SZEDER Gábor
2019-03-25 10:38 ` [PATCH 2/5] progress: return early when in the background SZEDER Gábor
2019-03-25 11:08 ` Ævar Arnfjörð Bjarmason [this message]
2019-03-25 11:39 ` SZEDER Gábor
2019-03-26 6:28 ` Luke Mewburn
2019-03-26 5:38 ` Jeff King
2019-03-25 10:38 ` [PATCH 3/5] progress: assemble percentage and counters in a strbuf before printing SZEDER Gábor
2019-03-26 5:45 ` Jeff King
2019-03-27 10:24 ` SZEDER Gábor
2019-03-28 2:12 ` Jeff King
2019-03-25 10:38 ` [PATCH 4/5] progress: clear previous progress update dynamically SZEDER Gábor
2019-03-25 10:38 ` [PATCH 5/5] progress: break too long progress bar lines SZEDER Gábor
2019-03-25 11:02 ` Duy Nguyen
2019-03-25 11:12 ` SZEDER Gábor
2019-03-26 5:52 ` [PATCH 0/5] Progress display fixes Jeff King
2019-04-01 11:52 ` [PATCH v2 0/4] " SZEDER Gábor
2019-04-01 11:52 ` [PATCH v2 1/4] progress: make display_progress() return void SZEDER Gábor
2019-04-02 5:42 ` Eric Sunshine
2019-04-01 11:52 ` [PATCH v2 2/4] progress: assemble percentage and counters in a strbuf before printing SZEDER Gábor
2019-04-02 5:45 ` Eric Sunshine
2019-04-02 5:50 ` Eric Sunshine
2019-04-01 11:52 ` [PATCH v2 3/4] progress: clear previous progress update dynamically SZEDER Gábor
2019-04-01 13:30 ` Jeff King
2019-04-01 14:15 ` SZEDER Gábor
2019-04-02 14:27 ` Jeff King
2019-04-01 11:52 ` [PATCH v2 4/4] progress: break too long progress bar lines SZEDER Gábor
2019-04-05 0:45 ` [PATCH v3 0/4] Progress display fixes SZEDER Gábor
2019-04-05 0:45 ` [PATCH v3 1/4] progress: make display_progress() return void SZEDER Gábor
2019-04-05 0:45 ` [PATCH v3 2/4] progress: assemble percentage and counters in a strbuf before printing SZEDER Gábor
2019-04-05 0:45 ` [PATCH v3 3/4] progress: clear previous progress update dynamically SZEDER Gábor
2019-04-05 0:45 ` [PATCH v3 4/4] progress: break too long progress bar lines SZEDER Gábor
2019-04-05 22:21 ` [PATCH v3 0/4] Progress display fixes Jeff King
2019-04-12 19:45 ` [PATCH v4 " SZEDER Gábor
2019-04-12 19:45 ` [PATCH v4 1/4] progress: make display_progress() return void SZEDER Gábor
2019-04-12 19:45 ` [PATCH v4 2/4] progress: assemble percentage and counters in a strbuf before printing SZEDER Gábor
2019-04-12 19:45 ` [PATCH v4 3/4] progress: clear previous progress update dynamically SZEDER Gábor
2019-04-12 19:45 ` [PATCH v4 4/4] progress: break too long progress bar lines SZEDER Gábor
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8736nbcitc.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luke@mewburn.net \
--cc=szeder.dev@gmail.com \
/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://80x24.org/mirrors/git.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).