From: Jeff Hostetler <git@jeffhostetler.com>
To: Anh Le via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org
Cc: Timothy Jones <timothy@canva.com>,
Jeff Hostetler <jeffhost@microsoft.com>, Anh Le <anh@canva.com>
Subject: Re: [PATCH v2] index: add trace2 region for clear skip worktree
Date: Fri, 28 Oct 2022 12:50:02 -0400 [thread overview]
Message-ID: <ff5d79c9-35f8-8881-8349-63977732c422@jeffhostetler.com> (raw)
In-Reply-To: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>
On 10/27/22 8:46 PM, Anh Le via GitGitGadget wrote:
[...]
> diff --git a/sparse-index.c b/sparse-index.c
> index e4a54ce1943..dbf647949c1 100644
> --- a/sparse-index.c
> +++ b/sparse-index.c
> @@ -493,24 +493,38 @@ void clear_skip_worktree_from_present_files(struct index_state *istate)
> int dir_found = 1;
>
> int i;
> + int path_counts[2] = {0, 0};
> + int restarted = 0;
>
> if (!core_apply_sparse_checkout ||
> sparse_expect_files_outside_of_patterns)
> return;
>
> + trace2_region_enter("index", "clear_skip_worktree_from_present_files", istate->repo);
> restart:
> for (i = 0; i < istate->cache_nr; i++) {
> struct cache_entry *ce = istate->cache[i];
>
> - if (ce_skip_worktree(ce) &&
> - path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
> - if (S_ISSPARSEDIR(ce->ce_mode)) {
> - ensure_full_index(istate);
> - goto restart;
> + if (ce_skip_worktree(ce)) {
> + path_counts[restarted]++;
> + if (path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
> + if (S_ISSPARSEDIR(ce->ce_mode)) {
> + ensure_full_index(istate);
> + restarted = 1;
> + goto restart;
> + }
> + ce->ce_flags &= ~CE_SKIP_WORKTREE;
> }
> - ce->ce_flags &= ~CE_SKIP_WORKTREE;
> }
> }
> +
> + if (path_counts[0] > 0) {
> + trace2_data_intmax("index", istate->repo, "clear_skip_worktree_from_present_files/path_count", path_counts[0]);
> + }
> + if (restarted) {
> + trace2_data_intmax("index", istate->repo, "clear_skip_worktree_from_present_files/full_index/path_count", path_counts[1]);
> + }
> + trace2_region_leave("index", "clear_skip_worktree_from_present_files", istate->repo);
> }
This looks good. And I think it sets us up to later
answer some of our earlier perf questions after you
get some data.
For example, if the path_count[0] phase is expensive,
does the restart always need to restart the loop at i=0?
Granted, the `ensure_full_index()` may create a new cache-entry
array, so the value of `i` prior to the call may not correspond
to the same cell after the call at the `goto`, but we could
cache the strdup the pathname of cache[i] before the call and
do a find on the new cache[] afterwards to get the corresponding
i-prime value and let the restart start the loop on i-prime.
That's just an idea, but let's wait for the data to see if that
would be helpful.
Thanks!
Jeff
next prev parent reply other threads:[~2022-10-28 16:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 0:05 [PATCH] index: add trace2 region for clear skip worktree Anh Le via GitGitGadget
2022-10-26 3:16 ` Junio C Hamano
2022-10-26 14:13 ` Jeff Hostetler
2022-10-26 16:01 ` Junio C Hamano
2022-10-26 18:29 ` Jeff Hostetler
2022-10-27 0:04 ` Anh Le
2022-10-28 0:46 ` [PATCH v2] " Anh Le via GitGitGadget
2022-10-28 15:49 ` Derrick Stolee
2022-10-28 17:17 ` Junio C Hamano
2022-10-30 23:28 ` Anh Le
2022-10-28 16:50 ` Jeff Hostetler [this message]
2022-10-31 0:56 ` [PATCH v3] " Anh Le via GitGitGadget
2022-10-31 22:34 ` Taylor Blau
2022-11-03 23:04 ` [PATCH v4 0/2] " Anh Le via GitGitGadget
2022-11-03 23:05 ` [PATCH v4 1/2] " Anh Le via GitGitGadget
2022-11-03 23:05 ` [PATCH v4 2/2] index: raise a bug if the index is materialised more than once Anh Le via GitGitGadget
2022-11-05 0:29 ` [PATCH v4 0/2] index: add trace2 region for clear skip worktree Taylor Blau
2022-11-07 20:50 ` Derrick Stolee
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=ff5d79c9-35f8-8881-8349-63977732c422@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=anh@canva.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jeffhost@microsoft.com \
--cc=timothy@canva.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 read-only IMAP folder(s) and NNTP newsgroup(s).