From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Josh Steadmon" <steadmon@google.com>,
"Bruno Albuquerque" <bga@google.com>, "Jeff King" <peff@peff.net>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 6/8] serve.c: add trace2 regions for advertise & command
Date: Mon, 28 Jun 2021 21:19:23 +0200 [thread overview]
Message-ID: <patch-6.8-baeee6539ad-20210628T191634Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.8-00000000000-20210628T191634Z-avarab@gmail.com>
Now that we've factored out "call_{advertise,command}()" in a
preceding commit it becomes easy to trace all these callbacks with
trace2. Let's do that. As the tests demonstrate there's no v2 push
protocol, which the tests assert.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
serve.c | 24 ++++++++++++++++++++++--
t/t5705-session-id-in-capabilities.sh | 16 ++++++++++++++--
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/serve.c b/serve.c
index 85cd3eab26e..6dbd05248b9 100644
--- a/serve.c
+++ b/serve.c
@@ -111,14 +111,34 @@ static struct protocol_capability capabilities[] = {
static int call_advertise(struct protocol_capability *command,
struct repository *r, struct strbuf *value)
{
- return command->advertise(r, value);
+ int ret;
+ struct strbuf sb = STRBUF_INIT;
+ const char *msg;
+
+ strbuf_addf(&sb, "advertise/%s", command->name);
+ trace2_region_enter("serve", sb.buf, r);
+ ret = command->advertise(r, value);
+ msg = ret ? "advertised" : "hidden";
+ trace2_region_leave_printf("serve", sb.buf, r, "%s", msg);
+ strbuf_release(&sb);
+
+ return ret;
}
static int call_command(struct protocol_capability *command,
struct repository *r, struct strvec *keys,
struct packet_reader *request)
{
- return command->command(r, keys, request);
+ int ret;
+ struct strbuf sb = STRBUF_INIT;
+
+ strbuf_addf(&sb, "command/%s", command->name);
+ trace2_region_enter("serve", sb.buf, r);
+ ret = command->command(r, keys, request);
+ trace2_region_leave("serve", sb.buf, r);
+ strbuf_release(&sb);
+
+ return ret;
}
static void advertise_capabilities(void)
diff --git a/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
index f1d189d5bcc..cda78fa7a1d 100755
--- a/t/t5705-session-id-in-capabilities.sh
+++ b/t/t5705-session-id-in-capabilities.sh
@@ -57,7 +57,13 @@ do
--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
origin &&
grep \"key\":\"server-sid\" tr2-client-events &&
- grep \"key\":\"client-sid\" tr2-server-events
+ grep \"key\":\"client-sid\" tr2-server-events &&
+
+ if test "$PROTO" = 2
+ then
+ grep \"event\":\"region_enter\".*\"category\":\"serve\" tr2-server-events &&
+ grep \"event\":\"region_leave\".*\"category\":\"serve\" tr2-server-events
+ fi
'
test_expect_success "session IDs advertised (push v${PROTO})" '
@@ -71,7 +77,13 @@ do
--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
origin HEAD:new-branch &&
grep \"key\":\"server-sid\" tr2-client-events &&
- grep \"key\":\"client-sid\" tr2-server-events
+ grep \"key\":\"client-sid\" tr2-server-events &&
+
+ if test "$PROTO" = 2
+ then
+ ! grep \"event\":\"region_enter\".*\"category\":\"serve\" tr2-server-events &&
+ ! grep \"event\":\"region_leave\".*\"category\":\"serve\" tr2-server-events
+ fi
'
done
--
2.32.0.611.gd4a17395dfa
next prev parent reply other threads:[~2021-06-28 19:19 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 14:16 [PATCH 0/5] serve: add "configure" callback Ævar Arnfjörð Bjarmason
2021-06-16 14:16 ` [PATCH 1/5] serve: mark has_capability() as static Ævar Arnfjörð Bjarmason
2021-06-16 16:28 ` Eric Sunshine
2021-06-17 0:45 ` Junio C Hamano
2021-06-16 14:16 ` [PATCH 2/5] transport: rename "fetch" in transport_vtable to "fetch_refs" Ævar Arnfjörð Bjarmason
2021-06-16 14:16 ` [PATCH 3/5] transport: use designated initializers Ævar Arnfjörð Bjarmason
2021-06-16 14:16 ` [PATCH 4/5] serve: " Ævar Arnfjörð Bjarmason
2021-06-16 14:16 ` [PATCH 5/5] serve: add support for a git_config() callback Ævar Arnfjörð Bjarmason
2021-06-16 16:22 ` Jeff King
2021-06-16 16:23 ` [PATCH 0/5] serve: add "configure" callback Jeff King
2021-06-17 0:49 ` Junio C Hamano
2021-06-28 19:19 ` [PATCH v2 0/8] serve: add "startup_config" callback Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` [PATCH v2 1/8] serve: mark has_capability() as static Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` [PATCH v2 2/8] transport: rename "fetch" in transport_vtable to "fetch_refs" Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` [PATCH v2 3/8] transport: use designated initializers Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` [PATCH v2 4/8] serve: " Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` [PATCH v2 5/8] serve.c: add call_{advertise,command}() indirection Ævar Arnfjörð Bjarmason
2021-06-28 19:19 ` Ævar Arnfjörð Bjarmason [this message]
2021-07-01 16:30 ` [PATCH v2 6/8] serve.c: add trace2 regions for advertise & command Jeff King
2021-07-02 12:54 ` Ævar Arnfjörð Bjarmason
2021-07-05 12:24 ` Han-Wen Nienhuys
2021-06-28 19:19 ` [PATCH v2 7/8] serve: add support for a "startup" git_config() callback Ævar Arnfjörð Bjarmason
2021-07-01 16:43 ` Jeff King
2021-07-01 16:47 ` Jeff King
2021-07-02 12:55 ` Ævar Arnfjörð Bjarmason
2021-07-02 21:13 ` Jeff King
2021-07-05 12:23 ` Han-Wen Nienhuys
2021-07-05 12:34 ` Han-Wen Nienhuys
2021-06-28 19:19 ` [PATCH v2 8/8] upload-pack.c: convert to new serve.c "startup" config cb Ævar Arnfjörð Bjarmason
2021-07-05 14:00 ` Han-Wen Nienhuys
2021-07-21 23:40 ` [PATCH v3 00/12] serve.[ch]: general API cleanup Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 01/12] serve: mark has_capability() as static Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 02/12] transport: rename "fetch" in transport_vtable to "fetch_refs" Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 03/12] transport: use designated initializers Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 04/12] serve: " Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 05/12] serve.c: add call_{advertise,command}() indirection Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 06/12] serve: add support for a "startup" git_config() callback Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 07/12] serve.c: move version line to advertise_capabilities() Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 08/12] serve.[ch]: remove "serve_options", split up --advertise-refs code Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 09/12] {upload,receive}-pack tests: add --advertise-refs tests Ævar Arnfjörð Bjarmason
2021-08-03 6:00 ` [PATCH] fixup! " Carlo Marcelo Arenas Belón
2021-07-21 23:40 ` [PATCH v3 10/12] upload-pack: document and rename --advertise-refs Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 11/12] upload-pack.c: convert to new serve.c "startup" config cb Ævar Arnfjörð Bjarmason
2021-07-21 23:40 ` [PATCH v3 12/12] serve.[ch]: don't pass "struct strvec *keys" to commands Ævar Arnfjörð Bjarmason
2021-08-02 21:07 ` [PATCH v3 00/12] serve.[ch]: general API cleanup Josh Steadmon
2021-08-05 1:25 ` [PATCH v4 00/10] serve.[ch]: general API cleanup + --advertise-refs cleanup Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 01/10] serve: mark has_capability() as static Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 02/10] transport: rename "fetch" in transport_vtable to "fetch_refs" Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 03/10] transport: use designated initializers Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 04/10] serve: " Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 05/10] serve.[ch]: don't pass "struct strvec *keys" to commands Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 06/10] serve: move transfer.advertiseSID check into session_id_advertise() Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 07/10] serve.c: move version line to advertise_capabilities() Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 08/10] {upload,receive}-pack tests: add --advertise-refs tests Ævar Arnfjörð Bjarmason
2021-08-05 1:25 ` [PATCH v4 09/10] serve.[ch]: remove "serve_options", split up --advertise-refs code Ævar Arnfjörð Bjarmason
2021-08-24 16:52 ` Derrick Stolee
2021-08-05 1:25 ` [PATCH v4 10/10] upload-pack: document and rename --advertise-refs Ævar Arnfjörð Bjarmason
2021-08-24 16:55 ` [PATCH v4 00/10] serve.[ch]: general API cleanup + --advertise-refs cleanup 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
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=patch-6.8-baeee6539ad-20210628T191634Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=bga@google.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=steadmon@google.com \
--cc=sunshine@sunshineco.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).