From: Derrick Stolee <stolee@gmail.com>
To: Jeff King <peff@peff.net>, git@vger.kernel.org
Cc: "Taylor Blau" <me@ttaylorr.com>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH v2 1/2] commit-graph: bump DIE_ON_LOAD check to actual load-time
Date: Thu, 12 Sep 2019 15:30:26 -0400 [thread overview]
Message-ID: <ef10d60c-aab1-4336-a330-9ea4d102bbc5@gmail.com> (raw)
In-Reply-To: <20190912144434.GA25101@sigill.intra.peff.net>
On 9/12/2019 10:44 AM, Jeff King wrote:
> Commit 43d3561805 (commit-graph write: don't die if the existing graph
> is corrupt, 2019-03-25) added an environment variable we use only in the
> test suite, $GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD. But it put the check for
> this variable at the very top of prepare_commit_graph(), which is called
> every time we want to use the commit graph. Most importantly, it comes
> _before_ we check the fast-path "did we already try to load?", meaning
> we end up calling getenv() for every single use of the commit graph,
> rather than just when we load.
>
> getenv() is allowed to have unexpected side effects, but that shouldn't
> be a problem here; we're lazy-loading the graph so it's clear that at
> least _one_ invocation of this function is going to call it.
>
> But it is inefficient. getenv() typically has to do a linear search
> through the environment space.
>
> We could memoize the call, but it's simpler still to just bump the check
> down to the actual loading step. That's fine for our sole user in t5318,
> and produces this minor real-world speedup:
>
> [before]
> Benchmark #1: git -C linux rev-list HEAD >/dev/null
> Time (mean ± σ): 1.460 s ± 0.017 s [User: 1.174 s, System: 0.285 s]
> Range (min … max): 1.440 s … 1.491 s 10 runs
>
> [after]
> Benchmark #1: git -C linux rev-list HEAD >/dev/null
> Time (mean ± σ): 1.391 s ± 0.005 s [User: 1.118 s, System: 0.273 s]
> Range (min … max): 1.385 s … 1.399 s 10 runs
This looks like an important improvement on its own.
> Of course that actual speedup depends on how big your environment is. We
> can game it like this:
>
> for i in $(seq 10000); do
> export dummy$i=$i
> done
>
> in which case I get:
>
> [before]
> Benchmark #1: git -C linux rev-list HEAD >/dev/null
> Time (mean ± σ): 6.257 s ± 0.061 s [User: 6.005 s, System: 0.250 s]
> Range (min … max): 6.174 s … 6.337 s 10 runs
>
> [after]
> Benchmark #1: git -C linux rev-list HEAD >/dev/null
> Time (mean ± σ): 1.403 s ± 0.005 s [User: 1.146 s, System: 0.256 s]
> Range (min … max): 1.396 s … 1.412 s 10 runs
>
> So this is really more about avoiding the pathological case than
> providing a big real-world speedup.
This change is stunning. I'm _sure_ someone is hurting with this.
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> commit-graph.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/commit-graph.c b/commit-graph.c
> index 9b02d2c426..baeaf0d1bf 100644
> --- a/commit-graph.c
> +++ b/commit-graph.c
> @@ -468,14 +468,14 @@ static int prepare_commit_graph(struct repository *r)
> {
> struct object_directory *odb;
>
> - if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
> - die("dying as requested by the '%s' variable on commit-graph load!",
> - GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
> -
> if (r->objects->commit_graph_attempted)
> return !!r->objects->commit_graph;
> r->objects->commit_graph_attempted = 1;
>
> + if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
> + die("dying as requested by the '%s' variable on commit-graph load!",
> + GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
> +
> prepare_repo_settings(r);
>
> if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
LGTM, thanks!
-Stolee
next prev parent reply other threads:[~2019-09-12 19:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 0:04 [PATCH] upload-pack: disable commit graph more gently for shallow traversal Jeff King
2019-09-12 0:18 ` Jeff King
2019-09-12 1:11 ` [PATCH] list-objects: don't queue root trees unless revs->tree_objects is set Jeff King
2019-09-12 1:19 ` Jeff King
2019-09-12 12:31 ` Derrick Stolee
2019-09-12 16:52 ` Junio C Hamano
2019-09-12 22:34 ` Jeff King
2019-09-13 18:05 ` Junio C Hamano
2019-09-12 2:08 ` [PATCH] upload-pack: disable commit graph more gently for shallow traversal Taylor Blau
2019-09-12 14:03 ` Jeff King
2019-09-12 2:07 ` Taylor Blau
2019-09-12 11:06 ` SZEDER Gábor
2019-09-12 14:01 ` Jeff King
2019-09-12 12:46 ` Derrick Stolee
2019-09-12 13:59 ` Jeff King
2019-09-12 12:23 ` Derrick Stolee
2019-09-12 14:23 ` Jeff King
2019-09-12 19:27 ` Derrick Stolee
2019-09-12 14:41 ` [PATCH v2] upload-pack commit graph segfault fix Jeff King
2019-09-12 14:43 ` Jeff King
2019-09-12 14:44 ` [PATCH v2 1/2] commit-graph: bump DIE_ON_LOAD check to actual load-time Jeff King
2019-09-12 19:30 ` Derrick Stolee [this message]
2019-09-12 14:44 ` [PATCH v2 2/2] upload-pack: disable commit graph more gently for shallow traversal Jeff King
2019-09-13 13:26 ` Derrick Stolee
2019-09-12 16:56 ` [PATCH v2] upload-pack commit graph segfault fix Taylor Blau
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=ef10d60c-aab1-4336-a330-9ea4d102bbc5@gmail.com \
--to=stolee@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).