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>
This commit is contained in:

committed by
Junio C Hamano

parent
e544221d97
commit
ee4512ed48
31
usage.c
31
usage.c
@ -22,17 +22,48 @@ void vreportf(const char *prefix, const char *err, va_list params)
|
||||
static NORETURN void usage_builtin(const char *err, va_list params)
|
||||
{
|
||||
vreportf("usage: ", err, params);
|
||||
|
||||
/*
|
||||
* When we detect a usage error *before* the command dispatch in
|
||||
* cmd_main(), we don't know what verb to report. Force it to this
|
||||
* to facilitate post-processing.
|
||||
*/
|
||||
trace2_cmd_name("_usage_");
|
||||
|
||||
/*
|
||||
* Currently, the (err, params) are usually just the static usage
|
||||
* string which isn't very useful here. Usually, the call site
|
||||
* manually calls fprintf(stderr,...) with the actual detailed
|
||||
* syntax error before calling usage().
|
||||
*
|
||||
* TODO It would be nice to update the call sites to pass both
|
||||
* the static usage string and the detailed error message.
|
||||
*/
|
||||
|
||||
exit(129);
|
||||
}
|
||||
|
||||
static NORETURN void die_builtin(const char *err, va_list params)
|
||||
{
|
||||
/*
|
||||
* We call this trace2 function first and expect it to va_copy 'params'
|
||||
* before using it (because an 'ap' can only be walked once).
|
||||
*/
|
||||
trace2_cmd_error_va(err, params);
|
||||
|
||||
vreportf("fatal: ", err, params);
|
||||
|
||||
exit(128);
|
||||
}
|
||||
|
||||
static void error_builtin(const char *err, va_list params)
|
||||
{
|
||||
/*
|
||||
* We call this trace2 function first and expect it to va_copy 'params'
|
||||
* before using it (because an 'ap' can only be walked once).
|
||||
*/
|
||||
trace2_cmd_error_va(err, params);
|
||||
|
||||
vreportf("error: ", err, params);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user