From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Stefan Beller" <sbeller@google.com>,
"Brandon Williams" <bmwill@google.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Johannes Sixt" <j6t@kdbg.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 1/4] trace.c: introduce trace_run_command()
Date: Fri, 12 Jan 2018 16:56:04 +0700 [thread overview]
Message-ID: <20180112095607.18293-2-pclouds@gmail.com> (raw)
In-Reply-To: <20180112095607.18293-1-pclouds@gmail.com>
This is the same as the old code that uses trace_argv_printf() in
run-command.c. This function will be improved in later patches to
print more information from struct child_process.
A slight regression: the old code would print run-command.c:xxx as the
trace location site while the new code prints trace.c:xxx. This should
be fine until the second call site is added, then we might need a macro
wrapper named trace_run_command() to capture the right source location.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
run-command.c | 3 ++-
trace.c | 15 +++++++++++++++
trace.h | 3 +++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/run-command.c b/run-command.c
index 31fc5ea86e..002074b128 100644
--- a/run-command.c
+++ b/run-command.c
@@ -624,7 +624,8 @@ int start_command(struct child_process *cmd)
cmd->err = fderr[0];
}
- trace_argv_printf(cmd->argv, "trace: run_command:");
+ trace_run_command(cmd);
+
fflush(NULL);
#ifndef GIT_WINDOWS_NATIVE
diff --git a/trace.c b/trace.c
index b7530b51a9..f08c673b51 100644
--- a/trace.c
+++ b/trace.c
@@ -23,6 +23,7 @@
#include "cache.h"
#include "quote.h"
+#include "run-command.h"
struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
@@ -272,6 +273,20 @@ void trace_performance_fl(const char *file, int line, uint64_t nanos,
#endif /* HAVE_VARIADIC_MACROS */
+void trace_run_command(const struct child_process *cp)
+{
+ struct strbuf buf = STRBUF_INIT;
+
+ if (!prepare_trace_line(__FILE__, __LINE__,
+ &trace_default_key, &buf))
+ return;
+
+ strbuf_addf(&buf, "trace: run_command:");
+
+ sq_quote_argv(&buf, cp->argv, 0);
+ print_trace_line(&trace_default_key, &buf);
+}
+
static const char *quote_crnl(const char *path)
{
static struct strbuf new_path = STRBUF_INIT;
diff --git a/trace.h b/trace.h
index 88055abef7..e54c687f26 100644
--- a/trace.h
+++ b/trace.h
@@ -4,6 +4,8 @@
#include "git-compat-util.h"
#include "strbuf.h"
+struct child_process;
+
struct trace_key {
const char * const key;
int fd;
@@ -17,6 +19,7 @@ extern struct trace_key trace_default_key;
extern struct trace_key trace_perf_key;
extern void trace_repo_setup(const char *prefix);
+extern void trace_run_command(const struct child_process *cp);
extern int trace_want(struct trace_key *key);
extern void trace_disable(struct trace_key *key);
extern uint64_t getnanotime(void);
--
2.15.1.600.g899a5f85c6
next prev parent reply other threads:[~2018-01-12 9:57 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 10:48 [PATCH] run-command.c: print env vars when GIT_TRACE is set Nguyễn Thái Ngọc Duy
2018-01-10 18:09 ` Brandon Williams
2018-01-10 19:14 ` Stefan Beller
2018-01-10 19:26 ` Brandon Williams
2018-01-10 19:35 ` Stefan Beller
2018-01-11 9:47 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-01-11 11:25 ` Duy Nguyen
2018-01-11 17:53 ` Brandon Williams
2018-01-11 18:20 ` Stefan Beller
2018-01-11 19:27 ` Junio C Hamano
2018-01-12 9:23 ` Duy Nguyen
2018-01-12 9:56 ` [PATCH v3 0/4] " Nguyễn Thái Ngọc Duy
2018-01-12 9:56 ` Nguyễn Thái Ngọc Duy [this message]
2018-01-12 13:05 ` [PATCH v3 1/4] trace.c: introduce trace_run_command() Jeff King
2018-01-12 13:11 ` Jeff King
2018-01-12 9:56 ` [PATCH v3 2/4] trace.c: print program 'git' when child_process.git_cmd is set Nguyễn Thái Ngọc Duy
2018-01-12 13:05 ` Jeff King
2018-01-12 9:56 ` [PATCH v3 3/4] trace.c: print env vars in trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-12 13:13 ` Jeff King
2018-01-12 9:56 ` [PATCH v3 4/4] trace.c: be smart about what env to print " Nguyễn Thái Ngọc Duy
2018-01-12 13:33 ` Jeff King
2018-01-12 18:24 ` Junio C Hamano
2018-01-12 18:45 ` Jeff King
2018-01-12 19:19 ` Junio C Hamano
2018-01-12 19:23 ` Jeff King
2018-01-12 20:28 ` Brandon Williams
2018-01-12 22:54 ` Junio C Hamano
2018-01-13 4:54 ` Duy Nguyen
2018-01-13 6:47 ` Duy Nguyen
2018-01-12 13:36 ` [PATCH v3 0/4] run-command.c: print env vars when GIT_TRACE is set Jeff King
2018-01-12 13:38 ` [PATCH 5/4] sq_quote_argv: drop maxlen parameter Jeff King
2018-01-12 23:20 ` Junio C Hamano
2018-01-12 13:39 ` [PATCH 6/4] trace: avoid unnecessary quoting Jeff King
2018-01-12 18:06 ` [PATCH v3 0/4] run-command.c: print env vars when GIT_TRACE is set Stefan Beller
2018-01-12 17:19 ` Stefan Beller
2018-01-13 6:54 ` Duy Nguyen
2018-01-13 6:49 ` [PATCH v4 0/7] Trace env variables in run_command() Nguyễn Thái Ngọc Duy
2018-01-13 6:49 ` [PATCH v4 1/7] sq_quote_argv: drop maxlen parameter Nguyễn Thái Ngọc Duy
2018-01-13 6:49 ` [PATCH v4 2/7] trace: avoid unnecessary quoting Nguyễn Thái Ngọc Duy
2018-01-13 6:49 ` [PATCH v4 3/7] trace.c: move strbuf_release() out of print_trace_line() Nguyễn Thái Ngọc Duy
2018-01-13 7:14 ` Jeff King
2018-01-13 6:49 ` [PATCH v4 4/7] trace.c: introduce trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-13 6:49 ` [PATCH v4 5/7] trace.c: print program 'git' when child_process.git_cmd is set Nguyễn Thái Ngọc Duy
2018-01-13 6:49 ` [PATCH v4 6/7] trace.c: print env vars in trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-13 7:25 ` Jeff King
2018-01-16 22:13 ` Junio C Hamano
2018-01-16 22:20 ` Stefan Beller
2018-01-17 1:32 ` Junio C Hamano
2018-01-13 6:49 ` [PATCH v4 7/7] trace.c: print new cwd " Nguyễn Thái Ngọc Duy
2018-01-13 7:26 ` [PATCH v4 0/7] Trace env variables in run_command() Jeff King
2018-01-15 10:59 ` [PATCH v5 " Nguyễn Thái Ngọc Duy
2018-01-15 10:59 ` [PATCH v5 1/7] sq_quote_argv: drop maxlen parameter Nguyễn Thái Ngọc Duy
2018-01-15 10:59 ` [PATCH v5 2/7] trace: avoid unnecessary quoting Nguyễn Thái Ngọc Duy
2018-01-15 10:59 ` [PATCH v5 3/7] trace.c: move strbuf_release() out of print_trace_line() Nguyễn Thái Ngọc Duy
2018-01-16 18:24 ` Brandon Williams
2018-01-15 10:59 ` [PATCH v5 4/7] trace.c: introduce trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-17 22:21 ` Jeff King
2018-01-17 22:41 ` Junio C Hamano
2018-01-15 10:59 ` [PATCH v5 5/7] trace.c: print program 'git' when child_process.git_cmd is set Nguyễn Thái Ngọc Duy
2018-01-15 10:59 ` [PATCH v5 6/7] trace.c: print env vars in trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-16 18:32 ` Brandon Williams
2018-01-15 10:59 ` [PATCH v5 7/7] trace.c: print new cwd " Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 0/7] Trace env variables in run_command() Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 1/7] sq_quote_argv: drop maxlen parameter Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 2/7] trace: avoid unnecessary quoting Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 3/7] trace.c: move strbuf_release() out of print_trace_line() Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 4/7] run-command.c: introduce trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 5/7] run-command.c: print program 'git' when tracing git_cmd mode Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 6/7] run-command.c: print env vars in trace_run_command() Nguyễn Thái Ngọc Duy
2018-01-18 9:45 ` [PATCH v6 7/7] run-command.c: print new cwd " Nguyễn Thái Ngọc Duy
2018-01-19 21:39 ` [PATCH v6 0/7] Trace env variables in run_command() Jeff King
2018-01-11 10:07 ` [PATCH] run-command.c: print env vars when GIT_TRACE is set Jeff King
2018-01-11 11:13 ` Duy Nguyen
2018-01-11 18:21 ` Johannes Sixt
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=20180112095607.18293-2-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--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.
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).