From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v2.29.0-rc0
Date: Wed, 7 Oct 2020 11:45:33 -0400 [thread overview]
Message-ID: <20201007154533.GA186764@coredump.intra.peff.net> (raw)
In-Reply-To: <20201007153947.GA181281@coredump.intra.peff.net>
On Wed, Oct 07, 2020 at 11:39:47AM -0400, Jeff King wrote:
> You should see the:
>
> Receiving objects: 100% (300970/300970), 74.39 MiB | 57.93 MiB/s, done.
>
> progress. We used to follow that with:
>
> Resolving deltas: 100% (249340/249340), done.
>
> but now you get nothing for several seconds while we resolve deltas.
>
> The problem bisects to f08cbf60fe (index-pack: make quantum of work
> smaller, 2020-09-08) at the tip of jt/threaded-index-pack. I haven't dug
> further yet.
Hmm. That commit removes the call to display_progress() from the main
loop of threaded_second_pass(), and doesn't appear to add another one
anywhere. Is the solution really as simple as adding it back in? I.e.
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 8acd078aa0..6dbb4317e0 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1028,6 +1028,10 @@ static void *threaded_second_pass(void *data)
struct object_entry *child_obj;
struct base_data *child;
+ counter_lock();
+ display_progress(progress, nr_resolved_deltas);
+ counter_unlock();
+
work_lock();
if (list_empty(&work_head)) {
/*
That _seems_ to work fine, but I'm not sure why it was removed in the
first place (for a good reason, or simply as an accident when rewriting
the variable declarations at the top of the loop?).
-Peff
next prev parent reply other threads:[~2020-10-07 15:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 22:41 [ANNOUNCE] Git v2.29.0-rc0 Junio C Hamano
2020-10-05 23:33 ` Bryan Turner
2020-10-05 23:42 ` Randall S. Becker
2020-10-06 3:57 ` Martin Ågren
2020-10-06 6:08 ` Junio C Hamano
2020-10-07 9:54 ` Ævar Arnfjörð Bjarmason
2020-10-07 15:39 ` Jeff King
2020-10-07 15:45 ` Jeff King [this message]
2020-10-07 17:38 ` Junio C Hamano
2020-10-07 18:17 ` [PATCH 0/3] jt/threaded-inex-pack leftovers Jeff King
2020-10-07 18:19 ` [PATCH 1/3] index-pack: restore "resolving deltas" progress meter Jeff King
2020-10-07 18:50 ` Junio C Hamano
2020-10-07 18:19 ` [PATCH 2/3] index-pack: drop type_cas mutex Jeff King
2020-10-07 20:09 ` Jonathan Tan
2020-10-07 18:19 ` [PATCH 3/3] index-pack: stop mentioning find_unresolved_deltas() Jeff King
2020-10-07 18:41 ` [ANNOUNCE] Git v2.29.0-rc0 Jonathan Tan
2020-10-07 18:48 ` Jeff King
2020-10-07 20:16 ` [PATCH] index-pack: make get_base_data() comment clearer Jonathan Tan
2020-10-07 20:46 ` Junio C Hamano
2020-10-07 22:28 ` [ANNOUNCE] Git v2.29.0-rc0 Philippe Blain
2020-10-09 19:51 ` Randall S. Becker
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201007154533.GA186764@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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.
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 NNTP newsgroup(s).