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
@ -219,9 +219,29 @@ static int exists_in_PATH(const char *file)
|
||||
|
||||
int sane_execvp(const char *file, char * const argv[])
|
||||
{
|
||||
#ifndef GIT_WINDOWS_NATIVE
|
||||
/*
|
||||
* execvp() doesn't return, so we all we can do is tell trace2
|
||||
* what we are about to do and let it leave a hint in the log
|
||||
* (unless of course the execvp() fails).
|
||||
*
|
||||
* we skip this for Windows because the compat layer already
|
||||
* has to emulate the execvp() call anyway.
|
||||
*/
|
||||
int exec_id = trace2_exec(file, (const char **)argv);
|
||||
#endif
|
||||
|
||||
if (!execvp(file, argv))
|
||||
return 0; /* cannot happen ;-) */
|
||||
|
||||
#ifndef GIT_WINDOWS_NATIVE
|
||||
{
|
||||
int ec = errno;
|
||||
trace2_exec_result(exec_id, ec);
|
||||
errno = ec;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* When a command can't be found because one of the directories
|
||||
* listed in $PATH is unsearchable, execvp reports EACCES, but
|
||||
@ -712,6 +732,7 @@ fail_pipe:
|
||||
cmd->err = fderr[0];
|
||||
}
|
||||
|
||||
trace2_child_start(cmd);
|
||||
trace_run_command(cmd);
|
||||
|
||||
fflush(NULL);
|
||||
@ -926,6 +947,8 @@ end_of_spawn:
|
||||
#endif
|
||||
|
||||
if (cmd->pid < 0) {
|
||||
trace2_child_exit(cmd, -1);
|
||||
|
||||
if (need_in)
|
||||
close_pair(fdin);
|
||||
else if (cmd->in)
|
||||
@ -964,13 +987,16 @@ end_of_spawn:
|
||||
int finish_command(struct child_process *cmd)
|
||||
{
|
||||
int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
|
||||
trace2_child_exit(cmd, ret);
|
||||
child_process_clear(cmd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int finish_command_in_signal(struct child_process *cmd)
|
||||
{
|
||||
return wait_or_whine(cmd->pid, cmd->argv[0], 1);
|
||||
int ret = wait_or_whine(cmd->pid, cmd->argv[0], 1);
|
||||
trace2_child_exit(cmd, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@ -992,7 +1018,18 @@ int run_command_v_opt(const char **argv, int opt)
|
||||
return run_command_v_opt_cd_env(argv, opt, NULL, NULL);
|
||||
}
|
||||
|
||||
int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class)
|
||||
{
|
||||
return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, tr2_class);
|
||||
}
|
||||
|
||||
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env)
|
||||
{
|
||||
return run_command_v_opt_cd_env_tr2(argv, opt, dir, env, NULL);
|
||||
}
|
||||
|
||||
int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
|
||||
const char *const *env, const char *tr2_class)
|
||||
{
|
||||
struct child_process cmd = CHILD_PROCESS_INIT;
|
||||
cmd.argv = argv;
|
||||
@ -1004,6 +1041,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
|
||||
cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
|
||||
cmd.dir = dir;
|
||||
cmd.env = env;
|
||||
cmd.trace2_child_class = tr2_class;
|
||||
return run_command(&cmd);
|
||||
}
|
||||
|
||||
@ -1319,6 +1357,7 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
|
||||
hook.env = env;
|
||||
hook.no_stdin = 1;
|
||||
hook.stdout_to_stderr = 1;
|
||||
hook.trace2_hook_name = name;
|
||||
|
||||
return run_command(&hook);
|
||||
}
|
||||
@ -1807,3 +1846,21 @@ int run_processes_parallel(int n,
|
||||
pp_cleanup(&pp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int run_processes_parallel_tr2(int n, get_next_task_fn get_next_task,
|
||||
start_failure_fn start_failure,
|
||||
task_finished_fn task_finished, void *pp_cb,
|
||||
const char *tr2_category, const char *tr2_label)
|
||||
{
|
||||
int result;
|
||||
|
||||
trace2_region_enter_printf(tr2_category, tr2_label, NULL, "max:%d",
|
||||
((n < 1) ? online_cpus() : n));
|
||||
|
||||
result = run_processes_parallel(n, get_next_task, start_failure,
|
||||
task_finished, pp_cb);
|
||||
|
||||
trace2_region_leave(tr2_category, tr2_label, NULL);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user