From: "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff Hostetler <jeffhost@microsoft.com>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH 4/9] trace2: add thread-name override to event target
Date: Mon, 20 Dec 2021 15:01:04 +0000 [thread overview]
Message-ID: <e5021ab7f58e002410d2efe658064b3d8f3ec8ac.1640012469.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1099.git.1640012469.gitgitgadget@gmail.com>
From: Jeff Hostetler <jeffhost@microsoft.com>
Teach the Trace2 event target to allow the thread-name field to
be specified rather than always inherited from the TLS CTX.
This will be used in a future commit for global events that should
not be tied to a particular thread, such as a global stopwatch timer
that aggregates data from all threads.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
trace2/tr2_tgt_event.c | 59 ++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 28 deletions(-)
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index ca48d00aebc..4ce50944298 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -81,14 +81,17 @@ static void fn_term(void)
*/
static void event_fmt_prepare(const char *event_name, const char *file,
int line, const struct repository *repo,
- struct json_writer *jw)
+ struct json_writer *jw,
+ const char *thread_name_override)
{
- struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
struct tr2_tbuf tb_now;
jw_object_string(jw, "event", event_name);
jw_object_string(jw, "sid", tr2_sid_get());
- jw_object_string(jw, "thread", ctx->thread_name);
+ jw_object_string(jw, "thread",
+ ((thread_name_override && *thread_name_override)
+ ? thread_name_override
+ : tr2tls_get_self()->thread_name));
/*
* In brief mode, only emit <time> on these 2 event types.
@@ -114,7 +117,7 @@ static void fn_too_many_files_fl(const char *file, int line)
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_end(&jw);
tr2_dst_write_line(&tr2dst_event, &jw.json);
@@ -127,7 +130,7 @@ static void fn_version_fl(const char *file, int line)
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "evt", TR2_EVENT_VERSION);
jw_object_string(&jw, "exe", git_version_string);
jw_end(&jw);
@@ -147,7 +150,7 @@ static void fn_start_fl(const char *file, int line,
double t_abs = (double)us_elapsed_absolute / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_inline_begin_array(&jw, "argv");
jw_array_argv(&jw, argv);
@@ -166,7 +169,7 @@ static void fn_exit_fl(const char *file, int line, uint64_t us_elapsed_absolute,
double t_abs = (double)us_elapsed_absolute / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_intmax(&jw, "code", code);
jw_end(&jw);
@@ -182,7 +185,7 @@ static void fn_signal(uint64_t us_elapsed_absolute, int signo)
double t_abs = (double)us_elapsed_absolute / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw);
+ event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_intmax(&jw, "signo", signo);
jw_end(&jw);
@@ -198,7 +201,7 @@ static void fn_atexit(uint64_t us_elapsed_absolute, int code)
double t_abs = (double)us_elapsed_absolute / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw);
+ event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_intmax(&jw, "code", code);
jw_end(&jw);
@@ -231,7 +234,7 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
maybe_add_string_va(&jw, "msg", fmt, ap);
/*
* Also emit the format string as a field in case
@@ -253,7 +256,7 @@ static void fn_command_path_fl(const char *file, int line, const char *pathname)
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "path", pathname);
jw_end(&jw);
@@ -268,7 +271,7 @@ static void fn_command_ancestry_fl(const char *file, int line, const char **pare
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_inline_begin_array(&jw, "ancestry");
while ((parent_name = *parent_names++))
@@ -288,7 +291,7 @@ static void fn_command_name_fl(const char *file, int line, const char *name,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "name", name);
if (hierarchy && *hierarchy)
jw_object_string(&jw, "hierarchy", hierarchy);
@@ -304,7 +307,7 @@ static void fn_command_mode_fl(const char *file, int line, const char *mode)
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "name", mode);
jw_end(&jw);
@@ -319,7 +322,7 @@ static void fn_alias_fl(const char *file, int line, const char *alias,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "alias", alias);
jw_object_inline_begin_array(&jw, "argv");
jw_array_argv(&jw, argv);
@@ -338,7 +341,7 @@ static void fn_child_start_fl(const char *file, int line,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_intmax(&jw, "child_id", cmd->trace2_child_id);
if (cmd->trace2_hook_name) {
jw_object_string(&jw, "child_class", "hook");
@@ -371,7 +374,7 @@ static void fn_child_exit_fl(const char *file, int line,
double t_rel = (double)us_elapsed_child / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_intmax(&jw, "child_id", cid);
jw_object_intmax(&jw, "pid", pid);
jw_object_intmax(&jw, "code", code);
@@ -392,7 +395,7 @@ static void fn_child_ready_fl(const char *file, int line,
double t_rel = (double)us_elapsed_child / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_intmax(&jw, "child_id", cid);
jw_object_intmax(&jw, "pid", pid);
jw_object_string(&jw, "ready", ready);
@@ -411,7 +414,7 @@ static void fn_thread_start_fl(const char *file, int line,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_end(&jw);
tr2_dst_write_line(&tr2dst_event, &jw.json);
@@ -427,7 +430,7 @@ static void fn_thread_exit_fl(const char *file, int line,
double t_rel = (double)us_elapsed_thread / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_double(&jw, "t_rel", 6, t_rel);
jw_end(&jw);
@@ -442,7 +445,7 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_intmax(&jw, "exec_id", exec_id);
if (exe)
jw_object_string(&jw, "exe", exe);
@@ -463,7 +466,7 @@ static void fn_exec_result_fl(const char *file, int line,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_intmax(&jw, "exec_id", exec_id);
jw_object_intmax(&jw, "code", code);
jw_end(&jw);
@@ -479,7 +482,7 @@ static void fn_param_fl(const char *file, int line, const char *param,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, NULL, &jw);
+ event_fmt_prepare(event_name, file, line, NULL, &jw, NULL);
jw_object_string(&jw, "param", param);
jw_object_string(&jw, "value", value);
jw_end(&jw);
@@ -495,7 +498,7 @@ static void fn_repo_fl(const char *file, int line,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, repo, &jw);
+ event_fmt_prepare(event_name, file, line, repo, &jw, NULL);
jw_object_string(&jw, "worktree", repo->worktree);
jw_end(&jw);
@@ -516,7 +519,7 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,
struct json_writer jw = JSON_WRITER_INIT;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, repo, &jw);
+ event_fmt_prepare(event_name, file, line, repo, &jw, NULL);
jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
if (category)
jw_object_string(&jw, "category", category);
@@ -542,7 +545,7 @@ static void fn_region_leave_printf_va_fl(
double t_rel = (double)us_elapsed_region / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, repo, &jw);
+ event_fmt_prepare(event_name, file, line, repo, &jw, NULL);
jw_object_double(&jw, "t_rel", 6, t_rel);
jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
if (category)
@@ -570,7 +573,7 @@ static void fn_data_fl(const char *file, int line, uint64_t us_elapsed_absolute,
double t_rel = (double)us_elapsed_region / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, repo, &jw);
+ event_fmt_prepare(event_name, file, line, repo, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_double(&jw, "t_rel", 6, t_rel);
jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
@@ -598,7 +601,7 @@ static void fn_data_json_fl(const char *file, int line,
double t_rel = (double)us_elapsed_region / 1000000.0;
jw_object_begin(&jw, 0);
- event_fmt_prepare(event_name, file, line, repo, &jw);
+ event_fmt_prepare(event_name, file, line, repo, &jw, NULL);
jw_object_double(&jw, "t_abs", 6, t_abs);
jw_object_double(&jw, "t_rel", 6, t_rel);
jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
--
gitgitgadget
next prev parent reply other threads:[~2021-12-20 15:21 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 15:01 [PATCH 0/9] Trace2 stopwatch timers and global counters Jeff Hostetler via GitGitGadget
2021-12-20 15:01 ` [PATCH 1/9] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2021-12-20 15:01 ` [PATCH 2/9] trace2: convert tr2tls_thread_ctx.thread_name from strbuf to char* Jeff Hostetler via GitGitGadget
2021-12-20 16:31 ` Ævar Arnfjörð Bjarmason
2021-12-20 19:07 ` Jeff Hostetler
2021-12-20 19:35 ` Ævar Arnfjörð Bjarmason
2021-12-22 16:32 ` Jeff Hostetler
2021-12-21 7:33 ` Junio C Hamano
2021-12-21 7:22 ` Junio C Hamano
2021-12-22 16:28 ` Jeff Hostetler
2021-12-22 19:57 ` Junio C Hamano
2021-12-20 15:01 ` [PATCH 3/9] trace2: defer free of TLS CTX until program exit Jeff Hostetler via GitGitGadget
2021-12-21 7:30 ` Junio C Hamano
2021-12-22 21:59 ` Jeff Hostetler
2021-12-22 22:56 ` Junio C Hamano
2021-12-22 23:04 ` Jeff Hostetler
2021-12-23 7:38 ` Johannes Sixt
2021-12-23 18:18 ` Junio C Hamano
2021-12-27 18:51 ` Jeff Hostetler
2021-12-20 15:01 ` Jeff Hostetler via GitGitGadget [this message]
2021-12-20 15:01 ` [PATCH 5/9] trace2: add thread-name override to perf target Jeff Hostetler via GitGitGadget
2021-12-20 15:01 ` [PATCH 6/9] trace2: add timer events to perf and event target formats Jeff Hostetler via GitGitGadget
2021-12-20 16:39 ` Ævar Arnfjörð Bjarmason
2021-12-20 19:44 ` Jeff Hostetler
2021-12-21 14:20 ` Derrick Stolee
2021-12-20 15:01 ` [PATCH 7/9] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2021-12-20 16:42 ` Ævar Arnfjörð Bjarmason
2021-12-22 21:38 ` Jeff Hostetler
2021-12-21 14:45 ` Derrick Stolee
2021-12-22 21:57 ` Jeff Hostetler
2021-12-20 15:01 ` [PATCH 8/9] trace2: add counter events to perf and event target formats Jeff Hostetler via GitGitGadget
2021-12-20 16:51 ` Ævar Arnfjörð Bjarmason
2021-12-22 22:56 ` Jeff Hostetler
2021-12-20 15:01 ` [PATCH 9/9] trace2: add global counters Jeff Hostetler via GitGitGadget
2021-12-20 17:14 ` Ævar Arnfjörð Bjarmason
2021-12-22 22:18 ` Jeff Hostetler
2021-12-21 14:51 ` [PATCH 0/9] Trace2 stopwatch timers and " Derrick Stolee
2021-12-21 23:27 ` Matheus Tavares
2021-12-28 19:36 ` [PATCH v2 " Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 1/9] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2021-12-29 0:48 ` Ævar Arnfjörð Bjarmason
2021-12-28 19:36 ` [PATCH v2 2/9] trace2: convert tr2tls_thread_ctx.thread_name from strbuf to flex array Jeff Hostetler via GitGitGadget
2021-12-29 1:11 ` Ævar Arnfjörð Bjarmason
2021-12-29 16:46 ` Jeff Hostetler
2021-12-28 19:36 ` [PATCH v2 3/9] trace2: defer free of thread local storage until program exit Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 4/9] trace2: add thread-name override to event target Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 5/9] trace2: add thread-name override to perf target Jeff Hostetler via GitGitGadget
2021-12-29 1:48 ` Ævar Arnfjörð Bjarmason
2021-12-29 17:15 ` Jeff Hostetler
2021-12-28 19:36 ` [PATCH v2 6/9] trace2: add timer events to perf and event target formats Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 7/9] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 8/9] trace2: add counter events to perf and event target formats Jeff Hostetler via GitGitGadget
2021-12-28 19:36 ` [PATCH v2 9/9] trace2: add global counters Jeff Hostetler via GitGitGadget
2021-12-29 1:54 ` [PATCH v2 0/9] Trace2 stopwatch timers and " Ævar Arnfjörð Bjarmason
2021-12-30 16:42 ` Jeff Hostetler
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e5021ab7f58e002410d2efe658064b3d8f3ec8ac.1640012469.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.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.
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 NNTP newsgroup(s).