diff options
author | Jeff Hostetler <jeffhost@microsoft.com> | 2019-02-22 23:25:01 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-23 00:27:59 +0100 |
commit | ee4512ed481a126dadd33334186e0e759d7f2f47 (patch) | |
tree | 4bc0418115d44b1833c1d24d2ac1c92f067b7ad3 /common-main.c | |
parent | trace2: Documentation/technical/api-trace2.txt (diff) | |
download | git-ee4512ed481a126dadd33334186e0e759d7f2f47.tar.xz git-ee4512ed481a126dadd33334186e0e759d7f2f47.zip |
trace2: create new combined trace facility
Create a new unified tracing facility for git. The eventual intent is to
replace the current trace_printf* and trace_performance* routines with a
unified set of git_trace2* routines.
In addition to the usual printf-style API, trace2 provides higer-level
event verbs with fixed-fields allowing structured data to be written.
This makes post-processing and analysis easier for external tools.
Trace2 defines 3 output targets. These are set using the environment
variables "GIT_TR2", "GIT_TR2_PERF", and "GIT_TR2_EVENT". These may be
set to "1" or to an absolute pathname (just like the current GIT_TRACE).
* GIT_TR2 is intended to be a replacement for GIT_TRACE and logs command
summary data.
* GIT_TR2_PERF is intended as a replacement for GIT_TRACE_PERFORMANCE.
It extends the output with columns for the command process, thread,
repo, absolute and relative elapsed times. It reports events for
child process start/stop, thread start/stop, and per-thread function
nesting.
* GIT_TR2_EVENT is a new structured format. It writes event data as a
series of JSON records.
Calls to trace2 functions log to any of the 3 output targets enabled
without the need to call different trace_printf* or trace_performance*
routines.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'common-main.c')
-rw-r--r-- | common-main.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/common-main.c b/common-main.c index 3728f66b4c..6dbdc4adf2 100644 --- a/common-main.c +++ b/common-main.c @@ -25,12 +25,18 @@ static void restore_sigpipe_to_default(void) int main(int argc, const char **argv) { + int result; + /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids messing up when the pipes are dup'ed * onto stdin/stdout/stderr in the child processes we spawn. */ sanitize_stdfds(); + restore_sigpipe_to_default(); + + trace2_initialize(); + trace2_cmd_start(argv); git_resolve_executable_dir(argv[0]); @@ -40,7 +46,9 @@ int main(int argc, const char **argv) attr_start(); - restore_sigpipe_to_default(); + result = cmd_main(argc, argv); + + trace2_cmd_exit(result); - return cmd_main(argc, argv); + return result; } |