From: Jeff King <peff@peff.net>
To: Augie Fackler <augie@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/3] trace: add GIT_TRACE_STDIN
Date: Tue, 16 Jun 2015 15:37:16 -0400 [thread overview]
Message-ID: <20150616193716.GC15931@peff.net> (raw)
In-Reply-To: <20150616193102.GA15856@peff.net>
Sometimes tracing the invocation of git programs with
GIT_TRACE is not quite enough to replay a situation; the
interesting input to the program often comes over its
standard input. For instance, if you want to replay a
particular fetch (e.g., for performance analysis or
debugging), you would want both the arguments and stdin sent
to pack-objects.
This patch lets you capture the stdin of any git process.
For instance:
GIT_TRACE=/tmp/processes.out \
GIT_TRACE_STDIN=/tmp/stdin.%p \
git daemon ...
After a fetch, processes.out will contain a line like:
15:19:08.275493 [pid=13196] git.c:348 trace:
built-in: git 'pack-objects' '--revs' '--thin' '--stdout'
'--progress' '--delta-base-offset'
And stdin.13196 (the pid picked from the above line) will
contain its stdin.
Signed-off-by: Jeff King <peff@peff.net>
---
git.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/git.c b/git.c
index 44374b1..e7e58e3 100644
--- a/git.c
+++ b/git.c
@@ -616,6 +616,65 @@ static void restore_sigpipe_to_default(void)
signal(SIGPIPE, SIG_DFL);
}
+static int copy_stdin(int in, int out, void *data)
+{
+ struct trace_key *key = data;
+ while (1) {
+ char buf[8192];
+ ssize_t len = xread(in, buf, sizeof(buf));
+ if (!len)
+ break;
+ if (len < 0) {
+ warning("error reading stdin trace: %s",
+ strerror(errno));
+ break;
+ }
+
+ trace_verbatim(key, buf, len);
+ if (write_in_full(out, buf, len) < 0) {
+ warning("error writing stdin trace: %s",
+ strerror(errno));
+ break;
+ }
+ }
+ close(in);
+ close(out);
+ return 0;
+}
+
+static void trace_stdin(void)
+{
+ static struct trace_key key = TRACE_KEY_INIT(STDIN);
+ static struct async async;
+
+ if (!trace_want(&key))
+ return;
+
+ memset(&async, 0, sizeof(async));
+ async.proc = copy_stdin;
+ async.data = &key;
+ async.in = dup(0);
+ async.out = -1;
+
+ if (async.in < 0 || start_async(&async) < 0) {
+ warning("unable to trace stdin: %s", strerror(errno));
+ return ;
+ }
+
+ /*
+ * At this point we've handed stdin off to the async process,
+ * so there we are past the point of no return.
+ */
+ if (dup2(async.out, 0))
+ die_errno("unable to redirect stdin from async process");
+ close(async.out);
+
+ /*
+ * leak async; we would know to finish_async() only when we are
+ * exiting, and there is no point then
+ */
+}
+
int main(int argc, char **av)
{
const char **argv = (const char **) av;
@@ -640,6 +699,7 @@ int main(int argc, char **av)
git_setup_gettext();
trace_command_performance(argv);
+ trace_stdin();
/*
* "git-xxxx" is the same as "git xxxx", but we obviously:
--
2.4.3.699.g84b4da7
next prev parent reply other threads:[~2015-06-16 19:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAGZ79kaS4utvDbXOo7emmSUH6M-8LY-oA65Ss3PLDkFModkbSg@mail.gmail.com>
2015-06-11 18:59 ` [PATCH v2] fetch-pack: optionally save packs to disk Augie Fackler
2015-06-12 6:22 ` Johannes Sixt
2015-06-12 15:07 ` Junio C Hamano
2015-06-12 17:02 ` Augie Fackler
2015-06-12 18:00 ` Jeff King
2015-06-12 21:25 ` Jeff King
2015-06-12 21:28 ` [PATCH 1/3] pkt-line: simplify starts_with checks in packet tracing Jeff King
2015-06-12 21:35 ` Stefan Beller
2015-06-12 21:28 ` [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing Jeff King
2015-06-12 21:39 ` Stefan Beller
2015-06-12 21:41 ` Jeff King
2015-06-12 21:43 ` Stefan Beller
2015-06-12 21:28 ` [PATCH 3/3] pkt-line: support tracing verbatim pack contents Jeff King
2015-06-16 15:38 ` Augie Fackler
2015-06-16 16:39 ` Junio C Hamano
2015-06-16 16:43 ` Jeff King
2015-06-16 16:52 ` Augie Fackler
2015-06-16 17:23 ` Jeff King
2015-06-16 17:10 ` Jeff King
2015-06-16 17:14 ` Augie Fackler
2015-06-16 17:18 ` Jeff King
2015-06-16 17:23 ` Augie Fackler
2015-06-16 19:31 ` [PATCH/RFC 0/3] add GIT_TRACE_STDIN Jeff King
2015-06-16 19:35 ` [PATCH 1/3] trace: implement %p placeholder for filenames Jeff King
2015-06-16 19:36 ` [PATCH 2/3] trace: add pid to each output line Jeff King
2015-06-16 19:37 ` Jeff King [this message]
2015-06-16 19:49 ` [PATCH 3/3] trace: add GIT_TRACE_STDIN Jeff King
2015-06-16 21:20 ` Jeff King
2015-06-17 10:04 ` Duy Nguyen
2015-06-17 19:10 ` Jeff King
2015-06-18 10:20 ` Duy Nguyen
2015-06-26 18:47 ` Junio C Hamano
2015-06-12 16:54 ` [PATCH v2] fetch-pack: optionally save packs to disk Augie Fackler
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=20150616193716.GC15931@peff.net \
--to=peff@peff.net \
--cc=augie@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sbeller@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).