{"thread":{"id":"50293","subject":"[PATCH 00/14] Trace2 tracing facility","startedAt":"2019-01-22T21:22:16Z","lastAt":"2019-05-20T16:50:41Z","messageCount":154,"participants":["Jeff Hostetler via GitGitGadget","Derrick Stolee via GitGitGadget","Junio C Hamano","Derrick Stolee","SZEDER Gábor","Josh Steadmon","Jeff Hostetler","Ævar Arnfjörð Bjarmason","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":14},"messages":[{"id":"367362","messageId":"pull.108.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":null,"subject":"[PATCH 00/14] Trace2 tracing facility","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:12Z","receivedAt":"2019-01-22T21:22:16Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"This patch series contains a greatly refactored version of my original\nTrace2 series [1] from August 2018.\n\nA new design doc in Documentation/technical/api-trace2.txt (in the first\ncommit) explains the relationship of Trace2 to the current tracing facility.\nCalls to the current tracing facility have not been changed, rather new\ntrace2 calls have been added so that both continue to work in parallel for\nthe time being.\n\n[1] https://public-inbox.org/git/pull.29.git.gitgitgadget@gmail.com/\n\nCc: gitster@pobox.comCc: peff@peff.netCc: jrnieder@gmail.com\n\nDerrick Stolee (1):\n pack-objects: add trace2 regions\n\nJeff Hostetler (13):\n trace2: Documentation/technical/api-trace2.txt\n trace2: create new combined trace facility\n trace2: collect platform-specific process information\n trace2:data: add trace2 regions to wt-status\n trace2:data: add editor/pager child classification\n trace2:data: add trace2 sub-process classification\n trace2:data: add trace2 transport child classification\n trace2:data: add trace2 hook classification\n trace2:data: add trace2 instrumentation to index read/write\n trace2:data: add subverb to checkout command\n trace2:data: add subverb to reset command\n trace2:data: add subverb for rebase\n trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh\n\n Documentation/technical/api-trace2.txt | 1158 ++++++++++++++++++++++++\n Makefile | 11 +\n builtin/am.c | 1 +\n builtin/checkout.c | 7 +\n builtin/pack-objects.c | 12 +-\n builtin/rebase.c | 19 +\n builtin/receive-pack.c | 4 +\n builtin/reset.c | 6 +\n builtin/submodule--helper.c | 11 +-\n builtin/worktree.c | 1 +\n cache.h | 1 +\n common-main.c | 13 +-\n compat/mingw.c | 11 +-\n compat/mingw.h | 3 +-\n compat/win32/ancestry.c | 102 +++\n config.c | 2 +\n config.mak.uname | 2 +\n connect.c | 3 +\n editor.c | 1 +\n exec-cmd.c | 2 +\n git-compat-util.h | 7 +\n git.c | 65 ++\n pager.c | 1 +\n read-cache.c | 47 +-\n remote-curl.c | 7 +\n repository.c | 2 +\n repository.h | 3 +\n run-command.c | 63 +-\n run-command.h | 17 +-\n sequencer.c | 2 +\n sh-i18n--envsubst.c | 3 +\n sub-process.c | 1 +\n submodule.c | 11 +-\n t/helper/test-parse-options.c | 3 +\n t/helper/test-tool.c | 4 +\n t/helper/test-tool.h | 1 +\n t/helper/test-trace2.c | 273 ++++++\n t/t0001-init.sh | 1 +\n t/t0210-trace2-normal.sh | 135 +++\n t/t0210/scrub_normal.perl | 48 +\n t/t0211-trace2-perf.sh | 153 ++++\n t/t0211/scrub_perf.perl | 76 ++\n t/t0212-trace2-event.sh | 237 +++++\n t/t0212/parse_events.perl | 251 +++++\n trace2.c | 809 +++++++++++++++++\n trace2.h | 403 +++++++++\n trace2/tr2_cfg.c | 92 ++\n trace2/tr2_cfg.h | 19 +\n trace2/tr2_dst.c | 90 ++\n trace2/tr2_dst.h | 34 +\n trace2/tr2_sid.c | 67 ++\n trace2/tr2_sid.h | 18 +\n trace2/tr2_tbuf.c | 32 +\n trace2/tr2_tbuf.h | 23 +\n trace2/tr2_tgt.h | 126 +++\n trace2/tr2_tgt_event.c | 606 +++++++++++++\n trace2/tr2_tgt_normal.c | 331 +++++++\n trace2/tr2_tgt_perf.c | 573 ++++++++++++\n trace2/tr2_tls.c | 164 ++++\n trace2/tr2_tls.h | 95 ++\n trace2/tr2_verb.c | 30 +\n trace2/tr2_verb.h | 24 +\n transport-helper.c | 2 +\n transport.c | 1 +\n usage.c | 31 +\n wt-status.c | 23 +-\n 66 files changed, 6353 insertions(+), 21 deletions(-)\n create mode 100644 Documentation/technical/api-trace2.txt\n create mode 100644 compat/win32/ancestry.c\n create mode 100644 t/helper/test-trace2.c\n create mode 100755 t/t0210-trace2-normal.sh\n create mode 100644 t/t0210/scrub_normal.perl\n create mode 100755 t/t0211-trace2-perf.sh\n create mode 100644 t/t0211/scrub_perf.perl\n create mode 100755 t/t0212-trace2-event.sh\n create mode 100644 t/t0212/parse_events.perl\n create mode 100644 trace2.c\n create mode 100644 trace2.h\n create mode 100644 trace2/tr2_cfg.c\n create mode 100644 trace2/tr2_cfg.h\n create mode 100644 trace2/tr2_dst.c\n create mode 100644 trace2/tr2_dst.h\n create mode 100644 trace2/tr2_sid.c\n create mode 100644 trace2/tr2_sid.h\n create mode 100644 trace2/tr2_tbuf.c\n create mode 100644 trace2/tr2_tbuf.h\n create mode 100644 trace2/tr2_tgt.h\n create mode 100644 trace2/tr2_tgt_event.c\n create mode 100644 trace2/tr2_tgt_normal.c\n create mode 100644 trace2/tr2_tgt_perf.c\n create mode 100644 trace2/tr2_tls.c\n create mode 100644 trace2/tr2_tls.h\n create mode 100644 trace2/tr2_verb.c\n create mode 100644 trace2/tr2_verb.h\n\n\nbase-commit: 77556354bb7ac50450e3b28999e3576969869068\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-108%2Fjeffhostetler%2Fcore-trace2-2019-v0-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-108/jeffhostetler/core-trace2-2019-v0-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/108\n-- \ngitgitgadget\n"},{"id":"367363","messageId":"978b9ebf0d263327e30ade48e1685077bc78cc81.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 04/14] trace2:data: add trace2 regions to wt-status","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:15Z","receivedAt":"2019-01-22T21:22:19Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nAdd trace2_region_enter() and trace2_region_leave() calls around the\nvarious phases of a status scan. This gives elapsed time for each\nphase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target.\n\nAlso, these Trace2 calls now use s->repo rather than the_repository.\n\nSigned-off-by: Jeff Hostetler \n---\n wt-status.c | 23 +++++++++++++++++++++--\n 1 file changed, 21 insertions(+), 2 deletions(-)\n\ndiff --git a/wt-status.c b/wt-status.c\nindex 0fe3bcd4cd..7c5ba4e902 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -748,12 +748,23 @@ static int has_unmerged(struct wt_status *s)\n \n void wt_status_collect(struct wt_status *s)\n {\n+\ttrace2_region_enter(\"status\", \"worktrees\", s->repo);\n \twt_status_collect_changes_worktree(s);\n-\tif (s->is_initial)\n+\ttrace2_region_leave(\"status\", \"worktrees\", s->repo);\n+\n+\tif (s->is_initial) {\n+\t\ttrace2_region_enter(\"status\", \"initial\", s->repo);\n \t\twt_status_collect_changes_initial(s);\n-\telse\n+\t\ttrace2_region_leave(\"status\", \"initial\", s->repo);\n+\t} else {\n+\t\ttrace2_region_enter(\"status\", \"index\", s->repo);\n \t\twt_status_collect_changes_index(s);\n+\t\ttrace2_region_leave(\"status\", \"index\", s->repo);\n+\t}\n+\n+\ttrace2_region_enter(\"status\", \"untracked\", s->repo);\n \twt_status_collect_untracked(s);\n+\ttrace2_region_leave(\"status\", \"untracked\", s->repo);\n \n \twt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, \"HEAD\"));\n \tif (s->state.merge_in_progress && !has_unmerged(s))\n@@ -2291,6 +2302,12 @@ static void wt_porcelain_v2_print(struct wt_status *s)\n \n void wt_status_print(struct wt_status *s)\n {\n+\ttrace2_data_intmax(\"status\", s->repo, \"count/changed\", s->change.nr);\n+\ttrace2_data_intmax(\"status\", s->repo, \"count/untracked\", s->untracked.nr);\n+\ttrace2_data_intmax(\"status\", s->repo, \"count/ignored\", s->ignored.nr);\n+\n+\ttrace2_region_enter(\"status\", \"print\", s->repo);\n+\n \tswitch (s->status_format) {\n \tcase STATUS_FORMAT_SHORT:\n \t\twt_shortstatus_print(s);\n@@ -2309,6 +2326,8 @@ void wt_status_print(struct wt_status *s)\n \t\twt_longstatus_print(s);\n \t\tbreak;\n \t}\n+\n+\ttrace2_region_leave(\"status\", \"print\", s->repo);\n }\n \n /**\n-- \ngitgitgadget\n\n"},{"id":"367364","messageId":"5baee8295ebbbe464e308c0f7aa1e84caa00ec6b.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 03/14] trace2: collect platform-specific process information","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:15Z","receivedAt":"2019-01-22T21:22:20Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nAdd optional platform-specific code to log information about\nthe current process.\n\nOn Windows, this includes whether git.exe is running under a\ndebugger and information about the ancestors of the process.\n\nThe purpose of this information is to help indicate if the\nprocess was launched interactively or in the background by\nan IDE, for example.\n\nSigned-off-by: Jeff Hostetler \n---\n common-main.c | 1 +\n compat/win32/ancestry.c | 102 ++++++++++++++++++++++++++++++++++++++++\n config.mak.uname | 2 +\n trace2.h | 13 +++++\n 4 files changed, 118 insertions(+)\n create mode 100644 compat/win32/ancestry.c\n\ndiff --git a/common-main.c b/common-main.c\nindex 6dbdc4adf2..d484aec209 100644\n--- a/common-main.c\n+++ b/common-main.c\n@@ -37,6 +37,7 @@ int main(int argc, const char **argv)\n \n \ttrace2_initialize();\n \ttrace2_cmd_start(argv);\n+\ttrace2_collect_process_info();\n \n \tgit_resolve_executable_dir(argv[0]);\n \ndiff --git a/compat/win32/ancestry.c b/compat/win32/ancestry.c\nnew file mode 100644\nindex 0000000000..629d8214b9\n--- /dev/null\n+++ b/compat/win32/ancestry.c\n@@ -0,0 +1,102 @@\n+#include \"../../cache.h\"\n+#include \"../../json-writer.h\"\n+#include \n+#include \n+\n+/*\n+ * Find the process data for the given PID in the given snapshot\n+ * and update the PROCESSENTRY32 data.\n+ */\n+static int find_pid(DWORD pid, HANDLE hSnapshot, PROCESSENTRY32 *pe32)\n+{\n+\tpe32->dwSize = sizeof(PROCESSENTRY32);\n+\n+\tif (Process32First(hSnapshot, pe32)) {\n+\t\tdo {\n+\t\t\tif (pe32->th32ProcessID == pid)\n+\t\t\t\treturn 1;\n+\t\t} while (Process32Next(hSnapshot, pe32));\n+\t}\n+\treturn 0;\n+}\n+\n+/*\n+ * Accumulate JSON array:\n+ * [\n+ * exe-name-parent,\n+ * exe-name-grand-parent,\n+ * ...\n+ * ]\n+ *\n+ * Note: we only report the filename of the process executable; the\n+ * only way to get its full pathname is to use OpenProcess()\n+ * and GetModuleFileNameEx() or QueryfullProcessImageName()\n+ * and that seems rather expensive (on top of the cost of\n+ * getting the snapshot).\n+ */\n+static void get_processes(struct json_writer *jw, HANDLE hSnapshot)\n+{\n+\tPROCESSENTRY32 pe32;\n+\tDWORD pid;\n+\n+\tpid = GetCurrentProcessId();\n+\n+\t/* We only want parent processes, so skip self. */\n+\tif (!find_pid(pid, hSnapshot, &pe32))\n+\t\treturn;\n+\tpid = pe32.th32ParentProcessID;\n+\n+\twhile (find_pid(pid, hSnapshot, &pe32)) {\n+\n+\t\tjw_array_string(jw, pe32.szExeFile);\n+\n+\t\tpid = pe32.th32ParentProcessID;\n+\t}\n+}\n+\n+/*\n+ * Emit JSON data for the current and parent processes. Individual\n+ * trace2 targets can decide how to actually print it.\n+ */\n+static void get_ancestry(void)\n+{\n+\tHANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\n+\n+\tif (hSnapshot != INVALID_HANDLE_VALUE) {\n+\t\tstruct json_writer jw = JSON_WRITER_INIT;\n+\n+\t\tjw_array_begin(&jw, 0);\n+\t\tget_processes(&jw, hSnapshot);\n+\t\tjw_end(&jw);\n+\n+\t\ttrace2_data_json(\"process\", the_repository,\n+\t\t\t\t \"windows/ancestry\", &jw);\n+\n+\t\tjw_release(&jw);\n+\t\tCloseHandle(hSnapshot);\n+\t}\n+}\n+\n+/*\n+ * Is a debugger attached to the current process?\n+ *\n+ * This will catch debug runs (where the debugger started the process).\n+ * This is the normal case. Since this code is called during our startup,\n+ * it will not report instances where a debugger is attached dynamically\n+ * to a running git process, but that is relatively rare.\n+ */\n+static void get_is_being_debugged(void)\n+{\n+\tif (IsDebuggerPresent())\n+\t\ttrace2_data_intmax(\"process\", the_repository,\n+\t\t\t \"windows/debugger_present\", 1);\n+}\n+\n+void trace2_collect_process_info(void)\n+{\n+\tif (!trace2_is_enabled())\n+\t\treturn;\n+\n+\tget_is_being_debugged();\n+\tget_ancestry();\n+}\ndiff --git a/config.mak.uname b/config.mak.uname\nindex e391431041..13d7c5410f 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -391,6 +391,7 @@ ifeq ($(uname_S),Windows)\n \tBASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE\n \tCOMPAT_OBJS = compat/msvc.o compat/winansi.o \\\n \t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n+\t\tcompat/win32/ancestry.o \\\n \t\tcompat/win32/dirent.o\n \tCOMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\\\".exe\\\"\n \tBASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE\n@@ -528,6 +529,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tCOMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32\n \tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n \tCOMPAT_OBJS += compat/mingw.o compat/winansi.o \\\n+\t\tcompat/win32/ancestry.o \\\n \t\tcompat/win32/path-utils.o \\\n \t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n \t\tcompat/win32/dirent.o\ndiff --git a/trace2.h b/trace2.h\nindex 7ab9f355f3..a4a075d060 100644\n--- a/trace2.h\n+++ b/trace2.h\n@@ -387,4 +387,17 @@ __attribute__((format (printf, 1, 2)))\n void trace2_printf(const char *fmt, ...);\n #endif\n \n+/*\n+ * Optional platform-specific code to dump information about the\n+ * current and any parent process(es). This is intended to allow\n+ * post-processors to know who spawned this git instance and anything\n+ * else the platform may be able to tell us about the current process.\n+ */\n+#if defined(GIT_WINDOWS_NATIVE)\n+void trace2_collect_process_info(void);\n+#else\n+#define trace2_collect_process_info() \\\n+\tdo {} while (0)\n+#endif\n+\n #endif /* TRACE2_H */\n-- \ngitgitgadget\n\n"},{"id":"367365","messageId":"49b6b9bd24e7ee2deaee83868e9d5e8c3d3c8956.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 07/14] trace2:data: add trace2 transport child classification","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:18Z","receivedAt":"2019-01-22T21:22:22Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nAdd trace2 child classification for transport processes.\n\nSigned-off-by: Jeff Hostetler \n---\n connect.c | 3 +++\n transport-helper.c | 2 ++\n 2 files changed, 5 insertions(+)\n\ndiff --git a/connect.c b/connect.c\nindex 24281b6082..3c6f829a05 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -1251,6 +1251,7 @@ struct child_process *git_connect(int fd[2], const char *url,\n \t\tconn = NULL;\n \t} else if (protocol == PROTO_GIT) {\n \t\tconn = git_connect_git(fd, hostandport, path, prog, version, flags);\n+\t\tconn->trace2_child_class = \"transport/git\";\n \t} else {\n \t\tstruct strbuf cmd = STRBUF_INIT;\n \t\tconst char *const *var;\n@@ -1293,9 +1294,11 @@ struct child_process *git_connect(int fd[2], const char *url,\n \t\t\t\tstrbuf_release(&cmd);\n \t\t\t\treturn NULL;\n \t\t\t}\n+\t\t\tconn->trace2_child_class = \"transport/ssh\";\n \t\t\tfill_ssh_args(conn, ssh_host, port, version, flags);\n \t\t} else {\n \t\t\ttransport_check_allowed(\"file\");\n+\t\t\tconn->trace2_child_class = \"transport/file\";\n \t\t\tif (version > 0) {\n \t\t\t\targv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT \"=version=%d\",\n \t\t\t\t\t\t version);\ndiff --git a/transport-helper.c b/transport-helper.c\nindex bf225c698f..1eb656b687 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -127,6 +127,8 @@ static struct child_process *get_helper(struct transport *transport)\n \t\targv_array_pushf(&helper->env_array, \"%s=%s\",\n \t\t\t\t GIT_DIR_ENVIRONMENT, get_git_dir());\n \n+\thelper->trace2_child_class = helper->args.argv[0]; /* \"remote-\" */\n+\n \tcode = start_command(helper);\n \tif (code < 0 && errno == ENOENT)\n \t\tdie(_(\"unable to find remote helper for '%s'\"), data->name);\n-- \ngitgitgadget\n\n"},{"id":"367366","messageId":"394164709724f6a90c03016aee4a65c671839459.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 05/14] trace2:data: add editor/pager child classification","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:16Z","receivedAt":"2019-01-22T21:22:23Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nAdd trace2 process classification for editor and pager\nchild processes.\n\nSigned-off-by: Jeff Hostetler \n---\n editor.c | 1 +\n pager.c | 1 +\n 2 files changed, 2 insertions(+)\n\ndiff --git a/editor.c b/editor.c\nindex c985eee1f9..71547674ab 100644\n--- a/editor.c\n+++ b/editor.c\n@@ -78,6 +78,7 @@ static int launch_specified_editor(const char *editor, const char *path,\n \t\tp.argv = args;\n \t\tp.env = env;\n \t\tp.use_shell = 1;\n+\t\tp.trace2_child_class = \"editor\";\n \t\tif (start_command(&p) < 0)\n \t\t\treturn error(\"unable to start editor '%s'\", editor);\n \ndiff --git a/pager.c b/pager.c\nindex a768797fcf..4168460ae9 100644\n--- a/pager.c\n+++ b/pager.c\n@@ -100,6 +100,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)\n \targv_array_push(&pager_process->args, pager);\n \tpager_process->use_shell = 1;\n \tsetup_pager_env(&pager_process->env_array);\n+\tpager_process->trace2_child_class = \"pager\";\n }\n \n void setup_pager(void)\n-- \ngitgitgadget\n\n"},{"id":"367367","messageId":"0f8f366bbebcb89e794425e4d557c6cf107f6f8a.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 08/14] trace2:data: add trace2 hook classification","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:19Z","receivedAt":"2019-01-22T21:22:25Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nClassify certain child processes as hooks.\n\nSigned-off-by: Jeff Hostetler \n---\n builtin/am.c | 1 +\n builtin/receive-pack.c | 4 ++++\n builtin/worktree.c | 1 +\n sequencer.c | 2 ++\n transport.c | 1 +\n 5 files changed, 9 insertions(+)\n\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 95370313b6..a81e61c1bc 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -468,6 +468,7 @@ static int run_post_rewrite_hook(const struct am_state *state)\n \n \tcp.in = xopen(am_path(state, \"rewritten\"), O_RDONLY);\n \tcp.stdout_to_stderr = 1;\n+\tcp.trace2_hook_name = \"post-rewrite\";\n \n \tret = run_command(&cp);\n \ndiff --git a/builtin/receive-pack.c b/builtin/receive-pack.c\nindex 33187bd8e9..6eef8575b9 100644\n--- a/builtin/receive-pack.c\n+++ b/builtin/receive-pack.c\n@@ -694,6 +694,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,\n \tproc.argv = argv;\n \tproc.in = -1;\n \tproc.stdout_to_stderr = 1;\n+\tproc.trace2_hook_name = hook_name;\n+\n \tif (feed_state->push_options) {\n \t\tint i;\n \t\tfor (i = 0; i < feed_state->push_options->nr; i++)\n@@ -807,6 +809,7 @@ static int run_update_hook(struct command *cmd)\n \tproc.stdout_to_stderr = 1;\n \tproc.err = use_sideband ? -1 : 0;\n \tproc.argv = argv;\n+\tproc.trace2_hook_name = \"update\";\n \n \tcode = start_command(&proc);\n \tif (code)\n@@ -1190,6 +1193,7 @@ static void run_update_post_hook(struct command *commands)\n \tproc.no_stdin = 1;\n \tproc.stdout_to_stderr = 1;\n \tproc.err = use_sideband ? -1 : 0;\n+\tproc.trace2_hook_name = \"post-update\";\n \n \tif (!start_command(&proc)) {\n \t\tif (use_sideband)\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 5e84026177..32e6f1b341 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -401,6 +401,7 @@ static int add_worktree(const char *path, const char *refname,\n \t\t\tcp.dir = path;\n \t\t\tcp.env = env;\n \t\t\tcp.argv = NULL;\n+\t\t\tcp.trace2_hook_name = \"post-checkout\";\n \t\t\targv_array_pushl(&cp.args, absolute_path(hook),\n \t\t\t\t\t oid_to_hex(&null_oid),\n \t\t\t\t\t oid_to_hex(&commit->object.oid),\ndiff --git a/sequencer.c b/sequencer.c\nindex b68bca0bef..9a6ec7fcd4 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -1102,6 +1102,7 @@ static int run_rewrite_hook(const struct object_id *oldoid,\n \tproc.argv = argv;\n \tproc.in = -1;\n \tproc.stdout_to_stderr = 1;\n+\tproc.trace2_hook_name = \"post-rewrite\";\n \n \tcode = start_command(&proc);\n \tif (code)\n@@ -3771,6 +3772,7 @@ static int pick_commits(struct repository *r,\n \t\t\t\thook.in = open(rebase_path_rewritten_list(),\n \t\t\t\t\tO_RDONLY);\n \t\t\t\thook.stdout_to_stderr = 1;\n+\t\t\t\thook.trace2_hook_name = \"post-rewrite\";\n \t\t\t\targv_array_push(&hook.args, post_rewrite_hook);\n \t\t\t\targv_array_push(&hook.args, \"rebase\");\n \t\t\t\t/* we don't care if this hook failed */\ndiff --git a/transport.c b/transport.c\nindex 99678153c1..ed5a733c4a 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -1061,6 +1061,7 @@ static int run_pre_push_hook(struct transport *transport,\n \n \tproc.argv = argv;\n \tproc.in = -1;\n+\tproc.trace2_hook_name = \"pre-push\";\n \n \tif (start_command(&proc)) {\n \t\tfinish_command(&proc);\n-- \ngitgitgadget\n\n"},{"id":"367368","messageId":"4aaf4834bfa9f2169e2c00f7cdc6c75281567c15.1548192131.git.gitgitgadget@gmail.com","threadId":"50293","inReplyTo":"pull.108.git.gitgitgadget@gmail.com","subject":"[PATCH 02/14] trace2: create new combined trace facility","fromName":"Jeff Hostetler via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-22T21:22:14Z","receivedAt":"2019-01-22T21:22:28Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"From: Jeff Hostetler \n\nCreate a new unified tracing facility for git. The eventual intent is to\nreplace the current trace_printf* and trace_performance* routines with a\nunified set of git_trace2* routines.\n\nIn addition to the usual printf-style API, trace2 provides higer-level\nevent verbs with fixed-fields allowing structured data to be written.\nThis makes post-processing and analysis easier for external tools.\n\nTrace2 defines 3 output targets. These are set using the environment\nvariables \"GIT_TR2\", \"GIT_TR2_PERF\", and \"GIT_TR2_EVENT\". These may be\nset to \"1\" or to an absolute pathname (just like the current GIT_TRACE).\n\n* GIT_TR2 is intended to be a replacement for GIT_TRACE and logs command\n summary data.\n\n* GIT_TR2_PERF is intended as a replacement for GIT_TRACE_PERFORMANCE.\n It extends the output with columns for the command process, thread,\n repo, absolute and relative elapsed times. It reports events for\n child process start/stop, thread start/stop, and per-thread function\n nesting.\n\n* GIT_TR2_EVENT is a new structured format. It writes event data as a\n series of JSON records.\n\nCalls to trace2 functions log to any of the 3 output targets enabled\nwithout the need to call different trace_printf* or trace_performance*\nroutines.\n\nSigned-off-by: Jeff Hostetler \n---\n Makefile | 10 +\n builtin/submodule--helper.c | 11 +-\n cache.h | 1 +\n common-main.c | 12 +-\n compat/mingw.c | 11 +-\n compat/mingw.h | 3 +-\n config.c | 2 +\n exec-cmd.c | 2 +\n git-compat-util.h | 7 +\n git.c | 65 +++\n remote-curl.c | 7 +\n repository.c | 2 +\n repository.h | 3 +\n run-command.c | 63 ++-\n run-command.h | 17 +-\n sh-i18n--envsubst.c | 3 +\n submodule.c | 11 +-\n t/helper/test-parse-options.c | 3 +\n t/helper/test-tool.c | 3 +\n t/t0001-init.sh | 1 +\n trace2.c | 809 ++++++++++++++++++++++++++++++++++\n trace2.h | 390 ++++++++++++++++\n trace2/tr2_cfg.c | 92 ++++\n trace2/tr2_cfg.h | 19 +\n trace2/tr2_dst.c | 90 ++++\n trace2/tr2_dst.h | 34 ++\n trace2/tr2_sid.c | 67 +++\n trace2/tr2_sid.h | 18 +\n trace2/tr2_tbuf.c | 32 ++\n trace2/tr2_tbuf.h | 23 +\n trace2/tr2_tgt.h | 126 ++++++\n trace2/tr2_tgt_event.c | 606 +++++++++++++++++++++++++\n trace2/tr2_tgt_normal.c | 331 ++++++++++++++\n trace2/tr2_tgt_perf.c | 573 ++++++++++++++++++++++++\n trace2/tr2_tls.c | 164 +++++++\n trace2/tr2_tls.h | 95 ++++\n trace2/tr2_verb.c | 30 ++\n trace2/tr2_verb.h | 24 +\n usage.c | 31 ++\n 39 files changed, 3774 insertions(+), 17 deletions(-)\n create mode 100644 trace2.c\n create mode 100644 trace2.h\n create mode 100644 trace2/tr2_cfg.c\n create mode 100644 trace2/tr2_cfg.h\n create mode 100644 trace2/tr2_dst.c\n create mode 100644 trace2/tr2_dst.h\n create mode 100644 trace2/tr2_sid.c\n create mode 100644 trace2/tr2_sid.h\n create mode 100644 trace2/tr2_tbuf.c\n create mode 100644 trace2/tr2_tbuf.h\n create mode 100644 trace2/tr2_tgt.h\n create mode 100644 trace2/tr2_tgt_event.c\n create mode 100644 trace2/tr2_tgt_normal.c\n create mode 100644 trace2/tr2_tgt_perf.c\n create mode 100644 trace2/tr2_tls.c\n create mode 100644 trace2/tr2_tls.h\n create mode 100644 trace2/tr2_verb.c\n create mode 100644 trace2/tr2_verb.h\n\ndiff --git a/Makefile b/Makefile\nindex 1a44c811aa..5d4e993cdc 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -996,6 +996,16 @@ LIB_OBJS += tempfile.o\n LIB_OBJS += thread-utils.o\n LIB_OBJS += tmp-objdir.o\n LIB_OBJS += trace.o\n+LIB_OBJS += trace2.o\n+LIB_OBJS += trace2/tr2_cfg.o\n+LIB_OBJS += trace2/tr2_dst.o\n+LIB_OBJS += trace2/tr2_sid.o\n+LIB_OBJS += trace2/tr2_tbuf.o\n+LIB_OBJS += trace2/tr2_tgt_event.o\n+LIB_OBJS += trace2/tr2_tgt_normal.o\n+LIB_OBJS += trace2/tr2_tgt_perf.o\n+LIB_OBJS += trace2/tr2_tls.o\n+LIB_OBJS += trace2/tr2_verb.o\n LIB_OBJS += trailer.o\n LIB_OBJS += transport.o\n LIB_OBJS += transport-helper.o\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex b45514be31..82716b5060 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -1813,11 +1813,12 @@ static int update_submodules(struct submodule_update_clone *suc)\n {\n \tint i;\n \n-\trun_processes_parallel(suc->max_jobs,\n-\t\t\t update_clone_get_next_task,\n-\t\t\t update_clone_start_failure,\n-\t\t\t update_clone_task_finished,\n-\t\t\t suc);\n+\trun_processes_parallel_tr2(suc->max_jobs,\n+\t\t\t\t update_clone_get_next_task,\n+\t\t\t\t update_clone_start_failure,\n+\t\t\t\t update_clone_task_finished,\n+\t\t\t\t suc,\n+\t\t\t\t \"submodule\", \"parallel/update\");\n \n \t/*\n \t * We saved the output and put it out all at once now.\ndiff --git a/cache.h b/cache.h\nindex 49713cc5a5..af996443ee 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -9,6 +9,7 @@\n #include \"gettext.h\"\n #include \"convert.h\"\n #include \"trace.h\"\n+#include \"trace2.h\"\n #include \"string-list.h\"\n #include \"pack-revindex.h\"\n #include \"hash.h\"\ndiff --git a/common-main.c b/common-main.c\nindex 3728f66b4c..6dbdc4adf2 100644\n--- a/common-main.c\n+++ b/common-main.c\n@@ -25,12 +25,18 @@ static void restore_sigpipe_to_default(void)\n \n int main(int argc, const char **argv)\n {\n+\tint result;\n+\n \t/*\n \t * Always open file descriptors 0/1/2 to avoid clobbering files\n \t * in die(). It also avoids messing up when the pipes are dup'ed\n \t * onto stdin/stdout/stderr in the child processes we spawn.\n \t */\n \tsanitize_stdfds();\n+\trestore_sigpipe_to_default();\n+\n+\ttrace2_initialize();\n+\ttrace2_cmd_start(argv);\n \n \tgit_resolve_executable_dir(argv[0]);\n \n@@ -40,7 +46,9 @@ int main(int argc, const char **argv)\n \n \tattr_start();\n \n-\trestore_sigpipe_to_default();\n+\tresult = cmd_main(argc, argv);\n+\n+\ttrace2_cmd_exit(result);\n \n-\treturn cmd_main(argc, argv);\n+\treturn result;\n }\ndiff --git a/compat/mingw.c b/compat/mingw.c\nindex b459e1a291..111fe68baf 100644\n--- a/compat/mingw.c\n+++ b/compat/mingw.c\n@@ -1476,19 +1476,23 @@ static int try_shell_exec(const char *cmd, char *const *argv)\n \t\treturn 0;\n \tprog = path_lookup(interpr, 1);\n \tif (prog) {\n+\t\tint exec_id;\n \t\tint argc = 0;\n \t\tconst char **argv2;\n \t\twhile (argv[argc]) argc++;\n \t\tALLOC_ARRAY(argv2, argc + 1);\n \t\targv2[0] = (char *)cmd;\t/* full path to the script file */\n \t\tmemcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);\n+\t\texec_id = trace2_exec(prog, argv2);\n \t\tpid = mingw_spawnv(prog, argv2, 1);\n \t\tif (pid >= 0) {\n \t\t\tint status;\n \t\t\tif (waitpid(pid, &status, 0) < 0)\n \t\t\t\tstatus = 255;\n+\t\t\ttrace2_exec_result(exec_id, status);\n \t\t\texit(status);\n \t\t}\n+\t\ttrace2_exec_result(exec_id, -1);\n \t\tpid = 1;\t/* indicate that we tried but failed */\n \t\tfree(prog);\n \t\tfree(argv2);\n@@ -1501,12 +1505,17 @@ int mingw_execv(const char *cmd, char *const *argv)\n \t/* check if git_command is a shell script */\n \tif (!try_shell_exec(cmd, argv)) {\n \t\tint pid, status;\n+\t\tint exec_id;\n \n+\t\texec_id = trace2_exec(cmd, (const char **)argv);\n \t\tpid = mingw_spawnv(cmd, (const char **)argv, 0);\n-\t\tif (pid < 0)\n+\t\tif (pid < 0) {\n+\t\t\ttrace2_exec_result(exec_id, -1);\n \t\t\treturn -1;\n+\t\t}\n \t\tif (waitpid(pid, &status, 0) < 0)\n \t\t\tstatus = 255;\n+\t\ttrace2_exec_result(exec_id, status);\n \t\texit(status);\n \t}\n \treturn -1;\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex 30d9fb3e36..4d73f8aa9d 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -147,8 +147,7 @@ static inline int fcntl(int fd, int cmd, ...)\n \terrno = EINVAL;\n \treturn -1;\n }\n-/* bash cannot reliably detect negative return codes as failure */\n-#define exit(code) exit((code) & 0xff)\n+\n #define sigemptyset(x) (void)0\n static inline int sigaddset(sigset_t *set, int signum)\n { return 0; }\ndiff --git a/config.c b/config.c\nindex ff521eb27a..4beeb7795a 100644\n--- a/config.c\n+++ b/config.c\n@@ -2656,6 +2656,8 @@ int git_config_set_gently(const char *key, const char *value)\n void git_config_set(const char *key, const char *value)\n {\n \tgit_config_set_multivar(key, value, NULL, 0);\n+\n+\ttrace2_cmd_set_config(key, value);\n }\n \n /*\ndiff --git a/exec-cmd.c b/exec-cmd.c\nindex 4f81f44310..7deeab3039 100644\n--- a/exec-cmd.c\n+++ b/exec-cmd.c\n@@ -209,6 +209,8 @@ static int git_get_exec_path(struct strbuf *buf, const char *argv0)\n \t\treturn -1;\n \t}\n \n+\ttrace2_cmd_path(buf->buf);\n+\n \treturn 0;\n }\n \ndiff --git a/git-compat-util.h b/git-compat-util.h\nindex b8ace77410..a41b277929 100644\n--- a/git-compat-util.h\n+++ b/git-compat-util.h\n@@ -1238,6 +1238,13 @@ static inline int is_missing_file_error(int errno_)\n \n extern int cmd_main(int, const char **);\n \n+/*\n+ * Intercept all calls to exit() and route them to trace2 to\n+ * optionally emit a message before calling the real exit().\n+ */\n+int trace2_cmd_exit_fl(const char *file, int line, int code);\n+#define exit(code) exit(trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))\n+\n /*\n * You can mark a stack variable with UNLEAK(var) to avoid it being\n * reported as a leak by tools like LSAN or valgrind. The argument\ndiff --git a/git.c b/git.c\nindex 4d53a3d50d..2db81c775a 100644\n--- a/git.c\n+++ b/git.c\n@@ -146,16 +146,20 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)\n \t\t\t\tgit_set_exec_path(cmd + 1);\n \t\t\telse {\n \t\t\t\tputs(git_exec_path());\n+\t\t\t\ttrace2_cmd_verb(\"_query_\");\n \t\t\t\texit(0);\n \t\t\t}\n \t\t} else if (!strcmp(cmd, \"--html-path\")) {\n \t\t\tputs(system_path(GIT_HTML_PATH));\n+\t\t\ttrace2_cmd_verb(\"_query_\");\n \t\t\texit(0);\n \t\t} else if (!strcmp(cmd, \"--man-path\")) {\n \t\t\tputs(system_path(GIT_MAN_PATH));\n+\t\t\ttrace2_cmd_verb(\"_query_\");\n \t\t\texit(0);\n \t\t} else if (!strcmp(cmd, \"--info-path\")) {\n \t\t\tputs(system_path(GIT_INFO_PATH));\n+\t\t\ttrace2_cmd_verb(\"_query_\");\n \t\t\texit(0);\n \t\t} else if (!strcmp(cmd, \"-p\") || !strcmp(cmd, \"--paginate\")) {\n \t\t\tuse_pager = 1;\n@@ -284,6 +288,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)\n \t\t\t(*argv)++;\n \t\t\t(*argc)--;\n \t\t} else if (skip_prefix(cmd, \"--list-cmds=\", &cmd)) {\n+\t\t\ttrace2_cmd_verb(\"_query_\");\n \t\t\tif (!strcmp(cmd, \"parseopt\")) {\n \t\t\t\tstruct string_list list = STRING_LIST_INIT_DUP;\n \t\t\t\tint i;\n@@ -331,9 +336,14 @@ static int handle_alias(int *argcp, const char ***argv)\n \t\t\tcommit_pager_choice();\n \n \t\t\tchild.use_shell = 1;\n+\t\t\tchild.trace2_child_class = \"shell_alias\";\n \t\t\targv_array_push(&child.args, alias_string + 1);\n \t\t\targv_array_pushv(&child.args, (*argv) + 1);\n \n+\t\t\ttrace2_cmd_alias(alias_command, child.args.argv);\n+\t\t\ttrace2_cmd_list_config();\n+\t\t\ttrace2_cmd_verb(\"_run_shell_alias_\");\n+\n \t\t\tret = run_command(&child);\n \t\t\tif (ret >= 0) /* normal exit */\n \t\t\t\texit(ret);\n@@ -368,6 +378,9 @@ static int handle_alias(int *argcp, const char ***argv)\n \t\t/* insert after command name */\n \t\tmemcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);\n \n+\t\ttrace2_cmd_alias(alias_command, new_argv);\n+\t\ttrace2_cmd_list_config();\n+\n \t\t*argv = new_argv;\n \t\t*argcp += count - 1;\n \n@@ -416,6 +429,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)\n \t\tsetup_work_tree();\n \n \ttrace_argv_printf(argv, \"trace: built-in: git\");\n+\ttrace2_cmd_verb(p->cmd);\n+\ttrace2_cmd_list_config();\n \n \tvalidate_cache_entries(&the_index);\n \tstatus = p->fn(argc, argv, prefix);\n@@ -665,7 +680,14 @@ static void execv_dashed_external(const char **argv)\n \tcmd.clean_on_exit = 1;\n \tcmd.wait_after_clean = 1;\n \tcmd.silent_exec_failure = 1;\n+\tcmd.trace2_child_class = \"dashed\";\n \n+\ttrace2_cmd_verb(\"_run_dashed_\");\n+\n+\t/*\n+\t * The code in run_command() logs trace2 child_start/child_exit\n+\t * events, so we do not need to report exec/exec_result events here.\n+\t */\n \ttrace_argv_printf(cmd.args.argv, \"trace: exec:\");\n \n \t/*\n@@ -675,6 +697,12 @@ static void execv_dashed_external(const char **argv)\n \t * the program.\n \t */\n \tstatus = run_command(&cmd);\n+\n+\t/*\n+\t * If the child process ran and we are now going to exit, emit a\n+\t * generic string as our trace2 command verb to indicate that we\n+\t * launched a dashed command.\n+\t */\n \tif (status >= 0)\n \t\texit(status);\n \telse if (errno != ENOENT)\n@@ -700,6 +728,43 @@ static int run_argv(int *argcp, const char ***argv)\n \t\tif (!done_alias)\n \t\t\thandle_builtin(*argcp, *argv);\n \n+#if 0 // TODO In GFW, need to amend a7924b655e940b06cb547c235d6bed9767929673 to include trace2_ and _tr2 lines.\n+\t\telse if (get_builtin(**argv)) {\n+\t\t\tstruct argv_array args = ARGV_ARRAY_INIT;\n+\t\t\tint i;\n+\n+\t\t\t/*\n+\t\t\t * The current process is committed to launching a\n+\t\t\t * child process to run the command named in (**argv)\n+\t\t\t * and exiting. Log a generic string as the trace2\n+\t\t\t * command verb to indicate this. Note that the child\n+\t\t\t * process will log the actual verb when it runs.\n+\t\t\t */\n+\t\t\ttrace2_cmd_verb(\"_run_git_alias_\");\n+\n+\t\t\tif (get_super_prefix())\n+\t\t\t\tdie(\"%s doesn't support --super-prefix\", **argv);\n+\n+\t\t\tcommit_pager_choice();\n+\n+\t\t\targv_array_push(&args, \"git\");\n+\t\t\tfor (i = 0; i < *argcp; i++)\n+\t\t\t\targv_array_push(&args, (*argv)[i]);\n+\n+\t\t\ttrace_argv_printf(args.argv, \"trace: exec:\");\n+\n+\t\t\t/*\n+\t\t\t * if we fail because the command is not found, it is\n+\t\t\t * OK to return. Otherwise, we just pass along the status code.\n+\t\t\t */\n+\t\t\ti = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE |\n+\t\t\t\t\t\t RUN_CLEAN_ON_EXIT, \"git_alias\");\n+\t\t\tif (i >= 0 || errno != ENOENT)\n+\t\t\t\texit(i);\n+\t\t\tdie(\"could not execute builtin %s\", **argv);\n+\t\t}\n+#endif // a7924b655e940b06cb547c235d6bed9767929673\n+\n \t\t/* .. then try the external ones */\n \t\texecv_dashed_external(*argv);\n \ndiff --git a/remote-curl.c b/remote-curl.c\nindex 1220dffcdc..8950b5c383 100644\n--- a/remote-curl.c\n+++ b/remote-curl.c\n@@ -1340,6 +1340,13 @@ int cmd_main(int argc, const char **argv)\n \tstring_list_init(&options.deepen_not, 1);\n \tstring_list_init(&options.push_options, 1);\n \n+\t/*\n+\t * Just report \"remote-curl\" here (folding all the various aliases\n+\t * (\"git-remote-http\", \"git-remote-https\", and etc.) here since they\n+\t * are all just copies of the same actual executable.\n+\t */\n+\ttrace2_cmd_verb(\"remote-curl\");\n+\n \tremote = remote_get(argv[1]);\n \n \tif (argc > 2) {\ndiff --git a/repository.c b/repository.c\nindex 7b02e1dffa..b741089dbb 100644\n--- a/repository.c\n+++ b/repository.c\n@@ -119,6 +119,8 @@ static int repo_init_gitdir(struct repository *repo, const char *gitdir)\n void repo_set_worktree(struct repository *repo, const char *path)\n {\n \trepo->worktree = real_pathdup(path, 1);\n+\n+\ttrace2_def_repo(repo);\n }\n \n static int read_and_verify_repository_format(struct repository_format *format,\ndiff --git a/repository.h b/repository.h\nindex 9f16c42c1e..97b03846ba 100644\n--- a/repository.h\n+++ b/repository.h\n@@ -90,6 +90,9 @@ struct repository {\n \t/* Repository's current hash algorithm, as serialized on disk. */\n \tconst struct git_hash_algo *hash_algo;\n \n+\t/* A unique-id for tracing purposes. */\n+\tint trace2_repo_id;\n+\n \t/* Configurations */\n \n \t/* Indicate if a repository has a different 'commondir' from 'gitdir' */\ndiff --git a/run-command.c b/run-command.c\nindex 3db26b7b0e..8948f6fc6f 100644\n--- a/run-command.c\n+++ b/run-command.c\n@@ -219,9 +219,29 @@ static int exists_in_PATH(const char *file)\n \n int sane_execvp(const char *file, char * const argv[])\n {\n+#ifndef GIT_WINDOWS_NATIVE\n+\t/*\n+\t * execvp() doesn't return, so we all we can do is tell trace2\n+\t * what we are about to do and let it leave a hint in the log\n+\t * (unless of course the execvp() fails).\n+\t *\n+\t * we skip this for Windows because the compat layer already\n+\t * has to emulate the execvp() call anyway.\n+\t */\n+\tint exec_id = trace2_exec(file, (const char**)argv);\n+#endif\n+\n \tif (!execvp(file, argv))\n \t\treturn 0; /* cannot happen ;-) */\n \n+#ifndef GIT_WINDOWS_NATIVE\n+\t{\n+\t\tint ec = errno;\n+\t\ttrace2_exec_result(exec_id, ec);\n+\t\terrno = ec;\n+\t}\n+#endif\n+\n \t/*\n \t * When a command can't be found because one of the directories\n \t * listed in $PATH is unsearchable, execvp reports EACCES, but\n@@ -712,6 +732,7 @@ int start_command(struct child_process *cmd)\n \t\tcmd->err = fderr[0];\n \t}\n \n+\ttrace2_child_start(cmd);\n \ttrace_run_command(cmd);\n \n \tfflush(NULL);\n@@ -926,6 +947,8 @@ int start_command(struct child_process *cmd)\n #endif\n \n \tif (cmd->pid < 0) {\n+\t\ttrace2_child_exit(cmd, -1);\n+\n \t\tif (need_in)\n \t\t\tclose_pair(fdin);\n \t\telse if (cmd->in)\n@@ -964,13 +987,16 @@ int start_command(struct child_process *cmd)\n int finish_command(struct child_process *cmd)\n {\n \tint ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);\n+\ttrace2_child_exit(cmd, ret);\n \tchild_process_clear(cmd);\n \treturn ret;\n }\n \n int finish_command_in_signal(struct child_process *cmd)\n {\n-\treturn wait_or_whine(cmd->pid, cmd->argv[0], 1);\n+\tint ret = wait_or_whine(cmd->pid, cmd->argv[0], 1);\n+\ttrace2_child_exit(cmd, ret);\n+\treturn ret;\n }\n \n \n@@ -992,7 +1018,18 @@ int run_command_v_opt(const char **argv, int opt)\n \treturn run_command_v_opt_cd_env(argv, opt, NULL, NULL);\n }\n \n+int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class)\n+{\n+\treturn run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, tr2_class);\n+}\n+\n int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env)\n+{\n+\treturn run_command_v_opt_cd_env_tr2(argv, opt, dir, env, NULL);\n+}\n+\n+int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir, const char *const *env,\n+\t\t\t\t const char *tr2_class)\n {\n \tstruct child_process cmd = CHILD_PROCESS_INIT;\n \tcmd.argv = argv;\n@@ -1004,6 +1041,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const\n \tcmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;\n \tcmd.dir = dir;\n \tcmd.env = env;\n+\tcmd.trace2_child_class = tr2_class;\n \treturn run_command(&cmd);\n }\n \n@@ -1319,6 +1357,7 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)\n \thook.env = env;\n \thook.no_stdin = 1;\n \thook.stdout_to_stderr = 1;\n+\thook.trace2_hook_name = name;\n \n \treturn run_command(&hook);\n }\n@@ -1807,3 +1846,25 @@ int run_processes_parallel(int n,\n \tpp_cleanup(&pp);\n \treturn 0;\n }\n+\n+int run_processes_parallel_tr2(int n,\n+\t\t\t get_next_task_fn get_next_task,\n+\t\t\t start_failure_fn start_failure,\n+\t\t\t task_finished_fn task_finished,\n+\t\t\t void *pp_cb,\n+\t\t\t const char *tr2_category,\n+\t\t\t const char *tr2_label)\n+{\n+\tint result;\n+\n+\ttrace2_region_enter_printf(tr2_category, tr2_label, NULL,\n+\t\t\t\t \"max:%d\", ((n < 1) ? online_cpus() : n));\n+\n+\tresult = run_processes_parallel(n, get_next_task, start_failure,\n+\t\t\t\t\ttask_finished, pp_cb);\n+\n+\ttrace2_region_leave(tr2_category, tr2_label, NULL);\n+\n+\treturn result;\n+}\n+\ndiff --git a/run-command.h b/run-command.h\nindex 68f5369fc2..91ac29102d 100644\n--- a/run-command.h\n+++ b/run-command.h\n@@ -10,6 +10,12 @@ struct child_process {\n \tstruct argv_array args;\n \tstruct argv_array env_array;\n \tpid_t pid;\n+\n+\tint trace2_child_id;\n+\tuint64_t trace2_child_us_start;\n+\tconst char *trace2_child_class;\n+\tconst char *trace2_hook_name;\n+\n \t/*\n \t * Using .in, .out, .err:\n \t * - Specify 0 for no redirections (child inherits stdin, stdout,\n@@ -73,12 +79,14 @@ extern int run_hook_ve(const char *const *env, const char *name, va_list args);\n #define RUN_USING_SHELL 16\n #define RUN_CLEAN_ON_EXIT 32\n int run_command_v_opt(const char **argv, int opt);\n-\n+int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);\n /*\n * env (the environment) is to be formatted like environ: \"VAR=VALUE\".\n * To unset an environment variable use just \"VAR\".\n */\n int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);\n+int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir, const char *const *env,\n+\t\t\t\t const char *tr2_class);\n \n /**\n * Execute the given command, sending \"in\" to its stdin, and capturing its\n@@ -220,5 +228,12 @@ int run_processes_parallel(int n,\n \t\t\t start_failure_fn,\n \t\t\t task_finished_fn,\n \t\t\t void *pp_cb);\n+int run_processes_parallel_tr2(int n,\n+\t\t\t get_next_task_fn,\n+\t\t\t start_failure_fn,\n+\t\t\t task_finished_fn,\n+\t\t\t void *pp_cb,\n+\t\t\t const char *tr2_category,\n+\t\t\t const char *tr2_label);\n \n #endif\ndiff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c\nindex 09c6b445b9..2296ba1a2d 100644\n--- a/sh-i18n--envsubst.c\n+++ b/sh-i18n--envsubst.c\n@@ -14,6 +14,7 @@\n */\n \n #include \"git-compat-util.h\"\n+#include \"trace2.h\"\n \n /* Substitution of environment variables in shell format strings.\n Copyright (C) 2003-2007 Free Software Foundation, Inc.\n@@ -67,6 +68,8 @@ cmd_main (int argc, const char *argv[])\n /* Default values for command line options. */\n /* unsigned short int show_variables = 0; */\n \n+ trace2_cmd_verb(\"sh-i18n--envsubst\");\n+\n switch (argc)\n \t{\n \tcase 1:\ndiff --git a/submodule.c b/submodule.c\nindex 6415cc5580..acc96e133b 100644\n--- a/submodule.c\n+++ b/submodule.c\n@@ -1374,11 +1374,12 @@ int fetch_populated_submodules(struct repository *r,\n \t/* default value, \"--submodule-prefix\" and its value are added later */\n \n \tcalculate_changed_submodule_paths(r);\n-\trun_processes_parallel(max_parallel_jobs,\n-\t\t\t get_next_submodule,\n-\t\t\t fetch_start_failure,\n-\t\t\t fetch_finish,\n-\t\t\t &spf);\n+\trun_processes_parallel_tr2(max_parallel_jobs,\n+\t\t\t\t get_next_submodule,\n+\t\t\t\t fetch_start_failure,\n+\t\t\t\t fetch_finish,\n+\t\t\t\t &spf,\n+\t\t\t\t \"submodule\", \"parallel/fetch\");\n \n \targv_array_clear(&spf.args);\n out:\ndiff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c\nindex 47fee660b8..5318681739 100644\n--- a/t/helper/test-parse-options.c\n+++ b/t/helper/test-parse-options.c\n@@ -2,6 +2,7 @@\n #include \"cache.h\"\n #include \"parse-options.h\"\n #include \"string-list.h\"\n+#include \"trace2.h\"\n \n static int boolean = 0;\n static int integer = 0;\n@@ -153,6 +154,8 @@ int cmd__parse_options(int argc, const char **argv)\n \tint i;\n \tint ret = 0;\n \n+\ttrace2_cmd_verb(\"_parse_\");\n+\n \targc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);\n \n \tif (length_cb.called) {\ndiff --git a/t/helper/test-tool.c b/t/helper/test-tool.c\nindex bfb195b1a8..85d1f812fe 100644\n--- a/t/helper/test-tool.c\n+++ b/t/helper/test-tool.c\n@@ -1,5 +1,6 @@\n #include \"git-compat-util.h\"\n #include \"test-tool.h\"\n+#include \"trace2.h\"\n \n struct test_cmd {\n \tconst char *name;\n@@ -78,6 +79,8 @@ int cmd_main(int argc, const char **argv)\n \t\tif (!strcmp(cmds[i].name, argv[1])) {\n \t\t\targv++;\n \t\t\targc--;\n+\t\t\ttrace2_cmd_verb(cmds[i].name);\n+\t\t\ttrace2_cmd_list_config();\n \t\t\treturn cmds[i].fn(argc, argv);\n \t\t}\n \t}\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 42a263cada..5e27604b24 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -93,6 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' '\n \t\tsed -n \\\n \t\t\t-e \"/^GIT_PREFIX=/d\" \\\n \t\t\t-e \"/^GIT_TEXTDOMAINDIR=/d\" \\\n+\t\t\t-e \"/^GIT_TR2_PARENT/d\" \\\n \t\t\t-e \"/^GIT_/s/=.*//p\" |\n \t\tsort\n \tEOF\ndiff --git a/trace2.c b/trace2.c\nnew file mode 100644\nindex 0000000000..72af89ba73\n--- /dev/null\n+++ b/trace2.c\n@@ -0,0 +1,809 @@\n+#include \"cache.h\"\n+#include \"config.h\"\n+#include \"json-writer.h\"\n+#include \"quote.h\"\n+#include \"run-command.h\"\n+#include \"sigchain.h\"\n+#include \"thread-utils.h\"\n+#include \"version.h\"\n+#include \"trace2/tr2_cfg.h\"\n+#include \"trace2/tr2_dst.h\"\n+#include \"trace2/tr2_sid.h\"\n+#include \"trace2/tr2_tgt.h\"\n+#include \"trace2/tr2_tls.h\"\n+#include \"trace2/tr2_verb.h\"\n+\n+static int trace2_enabled;\n+\n+static int tr2_next_child_id; /* modify under lock */\n+static int tr2_next_exec_id; /* modify under lock */\n+static int tr2_next_repo_id = 1; /* modify under lock. zero is reserved */\n+\n+/*\n+ * A table of the builtin TRACE2 targets. Each of these may be independently\n+ * enabled or disabled. Each TRACE2 API method will try to write an event to\n+ * *each* of the enabled targets.\n+ */\n+static struct tr2_tgt *tr2_tgt_builtins[] =\n+{\n+\t&tr2_tgt_normal,\n+\t&tr2_tgt_perf,\n+\t&tr2_tgt_event,\n+\tNULL\n+};\n+\n+#define for_each_builtin(j, tgt_j)\t\t\t\\\n+\tfor (j = 0, tgt_j = tr2_tgt_builtins[j];\t\\\n+\t tgt_j;\t\t\t\t\t\\\n+\t j++, tgt_j = tr2_tgt_builtins[j])\n+\n+#define for_each_wanted_builtin(j, tgt_j)\t\\\n+\tfor_each_builtin(j, tgt_j)\t\t\\\n+\tif (tr2_dst_trace_want(tgt_j->pdst))\n+\n+/*\n+ * Force (rather than lazily) initialize any of the requested\n+ * builtin TRACE2 targets at startup (and before we've seen an\n+ * actual TRACE2 event call) so we can see if we need to setup\n+ * the TR2 and TLS machinery.\n+ *\n+ * Return the number of builtin targets enabled.\n+ */\n+static int tr2_tgt_want_builtins(void)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tint sum = 0;\n+\n+\tfor_each_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_init())\n+\t\t\tsum++;\n+\t}\n+\n+\treturn sum;\n+}\n+\n+/*\n+ * Properly terminate each builtin target. Give each target\n+ * a chance to write a summary event and/or flush if necessary\n+ * and then close the fd.\n+ */\n+static void tr2_tgt_disable_builtins(void)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tfor_each_builtin(j, tgt_j) {\n+\t\ttgt_j->pfn_term();\n+\t}\n+}\n+\n+static int tr2main_exit_code;\n+\n+/*\n+ * Our atexit routine should run after everything has finished.\n+ *\n+ * Note that events generated here might not actually appear if\n+ * we are writing to fd 1 or 2 and our atexit routine runs after\n+ * the pager's atexit routine (since it closes them to shutdown\n+ * the pipes).\n+ */\n+static void tr2main_atexit_handler(void)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\t/*\n+\t * Clear any unbalanced regions so that our atexit message\n+\t * does not appear nested. This improves the appearance of\n+\t * the trace output if someone calls die(), for example.\n+\t */\n+\ttr2tls_pop_unwind_self();\n+\t\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_atexit)\n+\t\t\ttgt_j->pfn_atexit(us_elapsed_absolute,\n+\t\t\t\t\t tr2main_exit_code);\n+\t}\n+\n+\ttr2_tgt_disable_builtins();\n+\n+\ttr2tls_release();\n+\ttr2_sid_release();\n+\ttr2_verb_release();\n+\ttr2_cfg_free_patterns();\n+\n+\ttrace2_enabled = 0;\n+}\n+\n+static void tr2main_signal_handler(int signo)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_signal)\n+\t\t\ttgt_j->pfn_signal(us_elapsed_absolute, signo);\n+\t}\n+\n+\tsigchain_pop(signo);\n+\traise(signo);\n+}\n+\n+void trace2_initialize_fl(const char *file, int line)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (trace2_enabled)\n+\t\treturn;\n+\n+\tif (!tr2_tgt_want_builtins())\n+\t\treturn;\n+\ttrace2_enabled = 1;\n+\n+\ttr2_sid_get();\n+\n+\tatexit(tr2main_atexit_handler);\n+\tsigchain_push(SIGPIPE, tr2main_signal_handler);\n+\ttr2tls_init();\n+\n+\t/*\n+\t * Emit 'version' message on each active builtin target.\n+\t */\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_version_fl)\n+\t\t\ttgt_j->pfn_version_fl(file, line);\n+\t}\n+}\n+\n+int trace2_is_enabled(void)\n+{\n+\treturn trace2_enabled;\n+}\n+\n+void trace2_cmd_start_fl(const char *file, int line, const char **argv)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_start_fl)\n+\t\t\ttgt_j->pfn_start_fl(file, line, argv);\n+\t}\n+}\n+\n+int trace2_cmd_exit_fl(const char *file, int line, int code)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tcode &= 0xff;\n+\n+\tif (!trace2_enabled)\n+\t\treturn code;\n+\n+\ttr2main_exit_code = code;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_exit_fl)\n+\t\t\ttgt_j->pfn_exit_fl(file, line, us_elapsed_absolute, code);\n+\t}\n+\n+\treturn code;\n+}\n+\n+void trace2_cmd_error_va_fl(const char *file, int line,\n+\t\t\t const char *fmt, va_list ap)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\t/*\n+\t * We expect each target function to treat 'ap' as constant\n+\t * and use va_copy (because an 'ap' can only be walked once).\n+\t */\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_error_va_fl)\n+\t\t\ttgt_j->pfn_error_va_fl(file, line, fmt, ap);\n+\t}\n+}\n+\n+void trace2_cmd_path_fl(const char *file, int line, const char *pathname)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_command_path_fl)\n+\t\t\ttgt_j->pfn_command_path_fl(file, line, pathname);\n+\t}\n+}\n+\n+void trace2_cmd_verb_fl(const char *file, int line, const char *command_verb)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tconst char *hierarchy;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\ttr2_verb_append_hierarchy(command_verb);\n+\thierarchy = tr2_verb_get_hierarchy();\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_command_verb_fl)\n+\t\t\ttgt_j->pfn_command_verb_fl(file, line, command_verb,\n+\t\t\t\t\t\t hierarchy);\n+\t}\n+}\n+\n+void trace2_cmd_subverb_fl(const char *file, int line,\n+\t\t\t const char *command_subverb)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_command_subverb_fl)\n+\t\t\ttgt_j->pfn_command_subverb_fl(file, line,\n+\t\t\t\t\t\t command_subverb);\n+\t}\n+}\n+\n+void trace2_cmd_alias_fl(const char *file, int line,\n+\t\t\t const char *alias, const char **argv)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_alias_fl)\n+\t\t\ttgt_j->pfn_alias_fl(file, line, alias, argv);\n+\t}\n+}\n+\n+void trace2_cmd_list_config_fl(const char *file, int line)\n+{\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\ttr2_cfg_list_config_fl(file, line);\n+}\n+\n+void trace2_cmd_set_config_fl(const char *file, int line,\n+\t\t\t const char *key, const char *value)\n+{\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\ttr2_cfg_set_fl(file, line, key, value);\n+}\n+\n+void trace2_child_start_fl(const char *file, int line,\n+\t\t\t struct child_process *cmd)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\tcmd->trace2_child_id = tr2tls_locked_increment(&tr2_next_child_id);\n+\tcmd->trace2_child_us_start = us_now;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_child_start_fl)\n+\t\t\ttgt_j->pfn_child_start_fl(file, line,\n+\t\t\t\t\t\t us_elapsed_absolute, cmd);\n+\t}\n+}\n+\n+void trace2_child_exit_fl(const char *file, int line,\n+\t\t\t struct child_process *cmd,\n+\t\t\t int child_exit_code)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\tuint64_t us_elapsed_child;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\t\n+\tif (cmd->trace2_child_us_start)\n+\t\tus_elapsed_child = us_now - cmd->trace2_child_us_start;\n+\telse\n+\t\tus_elapsed_child = 0;\n+\t\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_child_exit_fl)\n+\t\t\ttgt_j->pfn_child_exit_fl(\n+\t\t\t\tfile, line, us_elapsed_absolute,\n+\t\t\t\tcmd->trace2_child_id,\n+\t\t\t\tcmd->pid,\n+\t\t\t\tchild_exit_code, us_elapsed_child);\n+\t}\n+}\n+\n+int trace2_exec_fl(const char *file, int line,\n+\t\t const char *exe, const char **argv)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tint exec_id;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn -1;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\texec_id = tr2tls_locked_increment(&tr2_next_exec_id);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_exec_fl)\n+\t\t\ttgt_j->pfn_exec_fl(file, line, us_elapsed_absolute,\n+\t\t\t\t\t exec_id, exe, argv);\n+\t}\n+\n+\treturn exec_id;\n+}\n+\n+void trace2_exec_result_fl(const char *file, int line, int exec_id, int code)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_exec_result_fl)\n+\t\t\ttgt_j->pfn_exec_result_fl(file, line,\n+\t\t\t\t\t\t us_elapsed_absolute,\n+\t\t\t\t\t\t exec_id, code);\n+\t}\n+}\n+\n+void trace2_thread_start_fl(const char *file, int line,\n+\t\t\t const char *thread_name)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tif (tr2tls_is_main_thread())\n+\t{\n+\t\t/*\n+\t\t * We should only be called from the new thread's thread-proc,\n+\t\t * so this is technically a bug. But in those cases where the\n+\t\t * main thread also runs the thread-proc function (or when we\n+\t\t * are built with threading disabled), we need to allow it.\n+\t\t *\n+\t\t * Convert this call to a region-enter so the nesting looks\n+\t\t * looks correct. \n+\t\t */\n+\t\ttrace2_region_enter_printf_fl(file, line, NULL, NULL, NULL,\n+\t\t\t\t\t \"thread-proc on main: %s\",\n+\t\t\t\t\t thread_name);\n+\t\treturn;\n+\t}\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\ttr2tls_create_self(thread_name);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_thread_start_fl)\n+\t\t\ttgt_j->pfn_thread_start_fl(file, line,\n+\t\t\t\t\t\t us_elapsed_absolute);\n+\t}\n+}\n+\n+void trace2_thread_exit_fl(const char *file, int line)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\tuint64_t us_elapsed_thread;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tif (tr2tls_is_main_thread())\n+\t{\n+\t\t/*\n+\t\t * We should only be called from the exiting thread's thread-proc,\n+\t\t * so this is technically a bug. But in those cases where the\n+\t\t * main thread also runs the thread-proc function (or when we\n+\t\t * are built with threading disabled), we need to allow it.\n+\t\t *\n+\t\t * Convert this call to a region-leave so the nesting looks\n+\t\t * looks correct. \n+\t\t */\n+\t\ttrace2_region_leave_printf_fl(file, line, NULL, NULL, NULL,\n+\t\t\t\t\t \"thread-proc on main\");\n+\t\treturn;\n+\t}\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\t/*\n+\t * Clear any unbalanced regions and then get the relative time\n+\t * for the outer-most region (which we pushed when the thread\n+\t * started). This gives us the run time of the thread.\n+\t */\n+\ttr2tls_pop_unwind_self();\n+\tus_elapsed_thread = tr2tls_region_elasped_self(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_thread_exit_fl)\n+\t\t\ttgt_j->pfn_thread_exit_fl(file, line,\n+\t\t\t\t\t\t us_elapsed_absolute,\n+\t\t\t\t\t\t us_elapsed_thread);\n+\t}\n+\n+\ttr2tls_unset_self();\n+}\n+\n+void trace2_def_param_fl(const char *file, int line,\n+\t\t\t const char *param, const char *value)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_param_fl)\n+\t\t\ttgt_j->pfn_param_fl(file, line, param, value);\n+\t}\n+}\n+\n+void trace2_def_repo_fl(const char *file, int line,\n+\t\t\tstruct repository *repo)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tif (repo->trace2_repo_id)\n+\t\treturn;\n+\n+\trepo->trace2_repo_id = tr2tls_locked_increment(&tr2_next_repo_id);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_repo_fl)\n+\t\t\ttgt_j->pfn_repo_fl(file, line, repo);\n+\t}\n+}\n+\n+void trace2_region_enter_printf_va_fl(const char *file, int line,\n+\t\t\t\t const char *category,\n+\t\t\t\t const char *label,\n+\t\t\t\t const struct repository *repo,\n+\t\t\t\t const char *fmt, va_list ap)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\t/*\n+\t * Print the region-enter message at the current nesting\n+\t * (indentation) level and then push a new level.\n+\t *\n+\t * We expect each target function to treat 'ap' as constant\n+\t * and use va_copy.\n+\t */\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_region_enter_printf_va_fl)\n+\t\t\ttgt_j->pfn_region_enter_printf_va_fl(\n+\t\t\t\tfile, line, us_elapsed_absolute,\n+\t\t\t\tcategory, label, repo, fmt, ap);\n+\t}\n+\n+\ttr2tls_push_self(us_now);\n+}\n+\n+void trace2_region_enter_fl(const char *file, int line,\n+\t\t\t const char *category,\n+\t\t\t const char *label,\n+\t\t\t const struct repository *repo)\n+{\n+\ttrace2_region_enter_printf_va_fl(file, line,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t NULL, NULL);\n+}\n+\n+void trace2_region_enter_printf_fl(const char *file, int line,\n+\t\t\t\t const char *category,\n+\t\t\t\t const char *label,\n+\t\t\t\t const struct repository *repo,\n+\t\t\t\t const char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_region_enter_printf_va_fl(file, line,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t fmt, ap);\n+\tva_end(ap);\n+}\n+\n+#ifndef HAVE_VARIADIC_MACROS\n+void trace2_region_enter_printf(const char *category, const char *label,\n+\t\t\t\tconst struct repository *repo,\n+\t\t\t\tconst char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_region_enter_printf_va_fl(NULL, 0,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t fmt, ap);\n+\tva_end(ap);\n+}\n+#endif\n+\n+void trace2_region_leave_printf_va_fl(const char *file, int line,\n+\t\t\t\t const char *category,\n+\t\t\t\t const char *label,\n+\t\t\t\t const struct repository *repo,\n+\t\t\t\t const char *fmt, va_list ap)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\tuint64_t us_elapsed_region;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\t/*\n+\t * Get the elapsed time in the current region before we\n+\t * pop it off the stack. Pop the stack. And then print\n+\t * the perf message at the new (shallower) level so that\n+\t * it lines up with the corresponding push/enter.\n+\t */\n+\tus_elapsed_region = tr2tls_region_elasped_self(us_now);\n+\t\n+\ttr2tls_pop_self();\n+\n+\t/*\n+\t * We expect each target function to treat 'ap' as constant\n+\t * and use va_copy.\n+\t */\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_region_leave_printf_va_fl)\n+\t\t\ttgt_j->pfn_region_leave_printf_va_fl(\n+\t\t\t\tfile, line, us_elapsed_absolute,\n+\t\t\t\tus_elapsed_region,\n+\t\t\t\tcategory, label, repo,\n+\t\t\t\tfmt, ap);\n+\t}\n+}\n+\n+void trace2_region_leave_fl(const char *file, int line,\n+\t\t\t const char *category,\n+\t\t\t const char *label,\n+\t\t\t const struct repository *repo)\n+{\n+\ttrace2_region_leave_printf_va_fl(file, line,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t NULL, NULL);\n+}\n+\n+void trace2_region_leave_printf_fl(const char *file, int line,\n+\t\t\t\t const char *category,\n+\t\t\t\t const char *label,\n+\t\t\t\t const struct repository *repo,\n+\t\t\t\t const char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_region_leave_printf_va_fl(file, line,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t fmt, ap);\n+\tva_end(ap);\n+}\n+\n+#ifndef HAVE_VARIADIC_MACROS\n+void trace2_region_leave_printf(const char *category, const char *label,\n+\t\t\t\tconst struct repository *repo,\n+\t\t\t\tconst char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_region_leave_printf_va_fl(NULL, 0,\n+\t\t\t\t\t category, label, repo,\n+\t\t\t\t\t fmt, ap);\n+\tva_end(ap);\n+}\n+#endif\n+\n+void trace2_data_string_fl(const char *file, int line,\n+\t\t\t const char *category,\n+\t\t\t const struct repository *repo,\n+\t\t\t const char *key,\n+\t\t\t const char *value)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\tuint64_t us_elapsed_region;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\tus_elapsed_region = tr2tls_region_elasped_self(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_data_fl)\n+\t\t\ttgt_j->pfn_data_fl(file, line, us_elapsed_absolute,\n+\t\t\t\t\t us_elapsed_region,\n+\t\t\t\t\t category, repo, key, value);\n+\t}\n+}\n+\n+void trace2_data_intmax_fl(const char *file, int line,\n+\t\t\t const char *category,\n+\t\t\t const struct repository *repo,\n+\t\t\t const char *key,\n+\t\t\t intmax_t value)\n+{\n+\tstruct strbuf buf_string = STRBUF_INIT;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tstrbuf_addf(&buf_string, \"%\"PRIdMAX, value);\n+\ttrace2_data_string_fl(file, line, category, repo, key, buf_string.buf);\n+\tstrbuf_release(&buf_string);\n+}\n+\n+void trace2_data_json_fl(const char *file, int line,\n+\t\t\t const char *category,\n+\t\t\t const struct repository *repo,\n+\t\t\t const char *key,\n+\t\t\t const struct json_writer *value)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\tuint64_t us_elapsed_region;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\tus_elapsed_region = tr2tls_region_elasped_self(us_now);\n+\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_data_fl)\n+\t\t\ttgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,\n+\t\t\t\t\t\tus_elapsed_region,\n+\t\t\t\t\t\tcategory, repo, key, value);\n+\t}\n+}\n+\n+void trace2_printf_va_fl(const char *file, int line,\n+\t\t\t const char *fmt, va_list ap)\n+{\n+\tstruct tr2_tgt *tgt_j;\n+\tint j;\n+\tuint64_t us_now;\n+\tuint64_t us_elapsed_absolute;\n+\n+\tif (!trace2_enabled)\n+\t\treturn;\n+\n+\tus_now = getnanotime() / 1000;\n+\tus_elapsed_absolute = tr2tls_absolute_elapsed(us_now);\n+\n+\t/*\n+\t * We expect each target function to treat 'ap' as constant\n+\t * and use va_copy.\n+\t */\n+\tfor_each_wanted_builtin(j, tgt_j) {\n+\t\tif (tgt_j->pfn_printf_va_fl)\n+\t\t\ttgt_j->pfn_printf_va_fl(file, line, us_elapsed_absolute,\n+\t\t\t\t\t\tfmt, ap);\n+\t}\n+}\n+\n+void trace2_printf_fl(const char *file, int line,\n+\t\t const char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_printf_va_fl(file, line, fmt, ap);\n+\tva_end(ap);\n+}\n+\n+#ifndef HAVE_VARIADIC_MACROS\n+void trace2_printf(const char *fmt, ...)\n+{\n+\tva_list ap;\n+\n+\tva_start(ap, fmt);\n+\ttrace2_printf_va_fl(NULL, 0, fmt, ap);\n+\tva_end(ap);\n+}\n+#endif\ndiff --git a/trace2.h b/trace2.h\nnew file mode 100644\nindex 0000000000..7ab9f355f3\n--- /dev/null\n+++ b/trace2.h\n@@ -0,0 +1,390 @@\n+#ifndef TRACE2_H\n+#define TRACE2_H\n+\n+struct child_process;\n+struct repository;\n+struct json_writer;\n+\n+/*\n+ * The public TRACE2 routines are grouped into the following groups:\n+ *\n+ * [] trace2_initialize -- initialization.\n+ * [] trace2_cmd_* -- emit command/control messages.\n+ * [] trace2_child* -- emit child start/stop messages.\n+ * [] trace2_exec* -- emit exec start/stop messages.\n+ * [] trace2_thread* -- emit thread start/stop messages.\n+ * [] trace2_def* -- emit definition/parameter mesasges.\n+ * [] trace2_region* -- emit region nesting messages.\n+ * [] trace2_data* -- emit region/thread/repo data messages.\n+ * [] trace2_printf* -- legacy trace[1] messages.\n+ */\n+\n+/*\n+ * Initialize TRACE2 tracing facility if any of the builtin TRACE2\n+ * targets are enabled in the environment. Emits a 'version' event.\n+ *\n+ * Cleanup/Termination is handled automatically by a registered\n+ * atexit() routine.\n+ */\n+void trace2_initialize_fl(const char *file, int line);\n+\n+#define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__)\n+\n+/*\n+ * Return true if trace2 is enabled.\n+ */\n+int trace2_is_enabled(void);\n+\n+/*\n+ * Emit a 'start' event with the original (unmodified) argv.\n+ */\n+void trace2_cmd_start_fl(const char *file, int line, const char **argv);\n+\n+#define trace2_cmd_start(argv) trace2_cmd_start_fl(__FILE__, __LINE__, (argv))\n+\n+/*\n+ * Emit an 'exit' event.\n+ *\n+ * Write the exit-code that will be passed to exit() or returned\n+ * from main().\n+ *\n+ * Use this prior to actually calling exit().\n+ * See \"#define exit()\" in git-compat-util.h\n+ */\n+int trace2_cmd_exit_fl(const char *file, int line, int code);\n+\n+#define trace2_cmd_exit(code) (trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))\n+\n+/*\n+ * Emit an 'error' event.\n+ *\n+ * Write an error message to the TRACE2 targets.\n+ */\n+void trace2_cmd_error_va_fl(const char *file, int line,\n+\t\t\t const char *fmt, va_list ap);\n+\n+#define trace2_cmd_error_va(fmt, ap) \\\n+\ttrace2_cmd_error_va_fl(__FILE__, __LINE__, (fmt), (ap))\n+\n+/*\n+ * Emit a 'pathname' event with the canonical pathname of the current process\n+ * This gives post-processors a simple field to identify the command without\n+ * having to parse the argv. For example, to distinguish invocations from\n+ * installed versus debug executables.\n+ */\n+void trace2_cmd_path_fl(const char *file, int line, const char *pathname);\n+\n+#define trace2_cmd_path(p) \\\n+\ttrace2_cmd_path_fl(__FILE__, __LINE__, (p))\n+\n+/*\n+ * Emit a 'cmd_verb' event with the canonical name of the (usually)\n+ * builtin command. This gives post-processors a simple field\n+ * to identify the command verb without having to parse the argv.\n+ */\n+void trace2_cmd_verb_fl(const char *file, int line, const char *command_verb);\n+\n+#define trace2_cmd_verb(v) \\\n+\ttrace2_cmd_verb_fl(__FILE__, __LINE__, (v))\n+\n+/*\n+ * Emit a 'cmd_subverb' event to further describe the command being run.\n+ * For example, \"checkout\" can checkout a single file or can checkout a\n+ * different branch. This gives post-processors a simple field to compare\n+ * equivalent commands without having to parse the argv.\n+ */\n+void trace2_cmd_subverb_fl(const char *file, int line,\n+\t\t\t const char *command_subverb);\n+\n+#define trace2_cmd_subverb(sv) \\\n+\ttrace2_cmd_subverb_fl(__FILE__, __LINE__, (sv))\n+\n+/*\n+ * Emit an 'alias' expansion event.\n+ */\n+void trace2_cmd_alias_fl(const char *file, int line,\n+\t\t\t const char *alias, const char **argv);\n+\n+#define trace2_cmd_alias(alias, argv) \\\n+\ttrace2_cmd_alias_fl(__FILE__, __LINE__, (alias), (argv))\n+\n+/*\n+ * Emit one or more 'def_param' events for \"interesting\" configuration\n+ * settings.\n+ *\n+ * The environment variable \"GIT_TR2_CONFIG_PARAMS\" can be set to a\n+ * list of patterns considered important. For example:\n+ *\n+ * GIT_TR2_CONFIG_PARAMS=\"core.*,remote.*.url\"\n+ *\n+ * Note: this routine does a read-only iteration on the config data\n+ * (using read_early_config()), so it must not be called until enough\n+ * of the process environment has been established. This includes the\n+ * location of the git and worktree directories, expansion of any \"-c\"\n+ * and \"-C\" command line options, and etc.\n+ */\n+void trace2_cmd_list_config_fl(const char *file, int line);\n+\n+#define trace2_cmd_list_config() \\\n+\ttrace2_cmd_list_config_fl(__FILE__, __LINE__)\n+\n+/*\n+ * Emit a \"def_param\" event for the given config key/value pair IF\n+ * we consider the key to be \"interesting\".\n+ *\n+ * Use this for new/updated config settings created/updated after\n+ * trace2_cmd_list_config() is called.\n+ */\n+void trace2_cmd_set_config_fl(const char *file, int line,\n+\t\t\t const char *key, const char *value);\n+\n+#define trace2_cmd_set_config(k, v) \\\n+\ttrace2_cmd_set_config_fl(__FILE__, __LINE__, (k), (v))\n+\n+/*\n+ * Emit a 'child_start' event prior to spawning a child process.\n+ *\n+ * Before calling optionally set \"cmd->trace2_child_class\" to a string\n+ * describing the type of the child process. For example, \"editor\" or\n+ * \"pager\".\n+ */\n+void trace2_child_start_fl(const char *file, int line,\n+\t\t\t struct child_process *cmd);\n+\n+#define trace2_child_start(cmd) \\\n+\ttrace2_child_start_fl(__FILE__, __LINE__, (cmd))\n+\n+/*\n+ * Emit a 'child_exit' event after the child process completes. \n+ */\n+void trace2_child_exit_fl(const char *file, int line,\n+\t\t\t struct child_process *cmd,\n+\t\t\t int child_exit_code);\n+\n+#define trace2_child_exit(cmd, code) \\\n+\ttrace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))\n+\n+/*\n+ * Emit an 'exec' event prior to calling one of exec(), execv(),\n+ * execvp(), and etc. On Unix-derived systems, this will be the\n+ * last event emitted for the current process, unless the exec\n+ * fails. On Windows, exec() behaves like 'child_start' and a\n+ * waitpid(), so additional events may be emitted.\n+ *\n+ * Returns the \"exec_id\".\n+ */\n+int trace2_exec_fl(const char *file, int line,\n+\t\t const char *exe, const char **argv);\n+\n+#define trace2_exec(exe, argv) \\\n+\ttrace2_exec_fl(__FILE__, __LINE__, (exe), (argv))\n+\n+/*\n+ * Emit an 'exec_result' when possible. On Unix-derived systems,\n+ * this should be called after exec() returns (which only happens\n+ * when there is an error starting the new process). On Windows,\n+ * this should be called after the waitpid().\n+ *\n+ * The \"exec_id\" should be the value returned from trace2_exec().\n+ */\n+void trace2_exec_result_fl(const char *file, int line, int exec_id, int code);\n+\n+#define trace2_exec_result(id, code) \\\n+\ttrace2_exec_result_fl(__FILE__, __LINE__, (id), (code))\n+\n+/*\n+ * Emit a 'thread_start' event. This must be called from inside the\n+ * thread-proc to set up the trace2 TLS data for the thread.\n+ *\n+ * Thread names should be descriptive, like \"preload_index\".\n+ * Thread names will be decorated with an instance number automatically.\n+ */\n+void trace2_thread_start_fl(const char *file, int line,\n+\t\t\t\t const char *thread_name);\n+\n+#define trace2_thread_start(thread_name) \\\n+\ttrace2_thread_start_fl(__FILE__, __LINE__, (thread_name))\n+\n+/*\n+ * Emit a 'thread_exit' event. This must be called from inside the\n+ * thread-proc to report thread-specific data and cleanup TLS data\n+ * for the thread.\n+ */\n+void trace2_thread_exit_fl(const char *file, int line);\n+\n+#define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__)\n+\n+/*\n+ * Emit a 'param' event.\n+ *\n+ * Write a \" = \" pair describing some aspect of the\n+ * run such as an important configuration setting or command line\n+ * option that significantly changes command behavior.\n+ */ \n+void trace2_def_param_fl(const char *file, int line,\n+\t\t\t const char *param, const char *value);\n+\n+#define trace2_def_param(param, value) \\\n+\ttrace2_def_param_fl(__FILE__, __LINE__, (param), (value))\n+\n+/*\n+ * Tell trace2 about a newly instantiated repo object and assign\n+ * a trace2-repo-id to be used in subsequent activity events.\n+ *\n+ * Emits a 'worktree' event for this repo instance.\n+ */\n+void trace2_def_repo_fl(const char *file, int line,\n+\t\t\tstruct repository *repo);\n+\n+#define trace2_def_repo(repo) \\\n+\ttrace2_def_repo_fl(__FILE__, __LINE__, repo)\n+\n+/*\n+ * Emit a 'region_enter' event for .