From: "erik chen via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v4 0/1] fetch: add trace2 instrumentation
Date: Mon, 18 Nov 2019 14:52:11 +0000 [thread overview]
Message-ID: <pull.451.v4.git.1574088732.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.451.v3.git.1573069152.gitgitgadget@gmail.com>
Add trace2 regions to fetch-pack.c to better track time spent in the various
phases of a fetch:
* matching common remote and local refs
* marking local refs as complete (part of the matching process)
Both of these stages can be slow for repositories with many refs.
Signed-off-by: Erik Chen erikchen@chromium.org [erikchen@chromium.org]
Erik Chen (1):
fetch: add trace2 instrumentation
fetch-pack.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
base-commit: d9f6f3b6195a0ca35642561e530798ad1469bd41
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-451%2Ferikchen%2Ftest12-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-451/erikchen/test12-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/451
Range-diff vs v3:
1: 364c526a5d ! 1: 508d07a3eb fetch: add trace2 instrumentation
@@ -6,7 +6,9 @@
phases of a fetch:
* matching common remote and local refs
- * marking local refs as complete (part of the matching process)
+ * parsing remote refs and finding a cutoff
+ * marking local refs as complete
+ * marking complete remote refs as common
Both of these stages can be slow for repositories with many refs.
@@ -21,14 +23,28 @@
+ trace2_region_enter("fetch-pack", "mark_complete_and_common_ref", NULL);
+
++ trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
for (ref = *refs; ref; ref = ref->next) {
struct object *o;
@@
+ if (!o)
+ continue;
+
+- /* We already have it -- which may mean that we were
++ /*
++ * We already have it -- which may mean that we were
+ * in sync with the other side at some time after
+ * that (it is OK if we guess wrong here).
+ */
+@@
+ cutoff = commit->date;
}
}
++ trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
-+ /* This block marks all local refs as COMPLETE, and then recursively marks all
++ /*
++ * This block marks all local refs as COMPLETE, and then recursively marks all
+ * parents of those refs as COMPLETE.
+ */
+ trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
@@ -43,8 +59,17 @@
/*
* Mark all complete remote refs as common refs.
+ * Don't mark them common yet; the server has to be told so first.
+ */
++ trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL);
+ for (ref = *refs; ref; ref = ref->next) {
+ struct object *o = deref_tag(the_repository,
+ lookup_object(the_repository,
@@
+ negotiator->known_common(negotiator,
+ (struct commit *)o);
}
++ trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL);
save_commit_buffer = old_save_commit_buffer;
+ trace2_region_leave("fetch-pack", "mark_complete_and_common_ref", NULL);
--
gitgitgadget
next prev parent reply other threads:[~2019-11-18 14:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 19:26 [PATCH 0/1] fetch: add trace2 instrumentation erik chen via GitGitGadget
2019-11-05 19:26 ` [PATCH 1/1] " Erik Chen via GitGitGadget
2019-11-06 12:30 ` Johannes Schindelin
2019-11-06 18:51 ` [PATCH v2 0/2] " erik chen via GitGitGadget
2019-11-06 18:51 ` [PATCH v2 1/2] " Erik Chen via GitGitGadget
2019-11-06 18:51 ` [PATCH v2 2/2] add whitespace Erik Chen via GitGitGadget
2019-11-06 19:39 ` [PATCH v3 0/1] fetch: add trace2 instrumentation erik chen via GitGitGadget
2019-11-06 19:39 ` [PATCH v3 1/1] " Erik Chen via GitGitGadget
2019-11-07 5:32 ` Junio C Hamano
2019-11-18 15:46 ` Derrick Stolee
2019-11-19 1:55 ` Junio C Hamano
2019-11-19 21:24 ` Erik Chen
2019-11-19 22:57 ` Erik Chen
2019-11-19 21:51 ` Erik Chen
2019-11-19 21:47 ` Erik Chen
2019-11-07 5:21 ` [PATCH v3 0/1] " Junio C Hamano
2019-11-19 21:44 ` Erik Chen
2019-11-18 14:52 ` erik chen via GitGitGadget [this message]
2019-11-18 14:52 ` [PATCH v4 1/1] " Erik Chen via GitGitGadget
2019-11-19 23:02 ` [PATCH v5 0/1] " erik chen via GitGitGadget
2019-11-19 23:02 ` [PATCH v5 1/1] " Erik Chen via GitGitGadget
2019-11-20 1:07 ` Junio C Hamano
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=pull.451.v4.git.1574088732.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).