From: "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff Hostetler" <git@jeffhostetler.com>,
"Derrick Stolee" <derrickstolee@github.com>,
"Jeff Hostetler" <jeffhost@microsoft.com>
Subject: [PATCH v3 0/8] Trace2 timers and counters and some cleanup
Date: Thu, 20 Oct 2022 18:28:01 +0000 [thread overview]
Message-ID: <pull.1373.v3.git.1666290489.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1373.v2.git.1665600750.gitgitgadget@gmail.com>
Here is version 2 of this series to add timers and counters to Trace2.
Changes since V1:
* I dropped the commits concerning compiler errors in Clang 11.0.0 on
MacOS. I've sent them to the mailing list in a separate series, since
they had nothing to do with the main topic of this series.
* I moved the documentation changes earlier in the series to get it out of
the way (and eliminate the need to update it later commits).
* After a long conversation on the mailing list, I redid the two
thread-name commits to simplify and hopefully eliminate the remaining
misunderstandings and/or short-comings of my previous attempt and
explanations. We now use a "const char *" for the field in the thread-ctx
that we format and detach from a strbuf during thread-start. The goal
here is to move away from a modifyable strbuf in the thread-ctx itself
(to avoid giving the appearance that a caller could modify the
thread-name at some point, when that was not intended).
The last 2 commits add the stopwatch timers and the global counters and are
unchanged from the previous version.
Jeff Hostetler (8):
trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
tr2tls: clarify TLS terminology
api-trace2.txt: elminate section describing the public trace2 API
trace2: rename the thread_name argument to trace2_thread_start
trace2: improve thread-name documentation in the thread-context
trace2: convert ctx.thread_name from strbuf to pointer
trace2: add stopwatch timers
trace2: add global counter mechanism
Documentation/technical/api-trace2.txt | 190 +++++++++++++++++--------
Makefile | 2 +
t/helper/test-trace2.c | 187 ++++++++++++++++++++++++
t/t0211-trace2-perf.sh | 95 +++++++++++++
t/t0211/scrub_perf.perl | 6 +
trace2.c | 121 +++++++++++++++-
trace2.h | 101 +++++++++++--
trace2/tr2_ctr.c | 101 +++++++++++++
trace2/tr2_ctr.h | 104 ++++++++++++++
trace2/tr2_tgt.h | 16 +++
trace2/tr2_tgt_event.c | 47 +++++-
trace2/tr2_tgt_normal.c | 39 +++++
trace2/tr2_tgt_perf.c | 43 +++++-
trace2/tr2_tls.c | 34 +++--
trace2/tr2_tls.h | 55 ++++---
trace2/tr2_tmr.c | 182 +++++++++++++++++++++++
trace2/tr2_tmr.h | 140 ++++++++++++++++++
17 files changed, 1361 insertions(+), 102 deletions(-)
create mode 100644 trace2/tr2_ctr.c
create mode 100644 trace2/tr2_ctr.h
create mode 100644 trace2/tr2_tmr.c
create mode 100644 trace2/tr2_tmr.h
base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1373%2Fjeffhostetler%2Ftrace2-stopwatch-v4-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1373/jeffhostetler/trace2-stopwatch-v4-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1373
Range-diff vs v2:
1: 6e7e4f3187e = 1: 6e7e4f3187e trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
2: 9dee7a75903 = 2: 9dee7a75903 tr2tls: clarify TLS terminology
3: 804dab9e1a7 = 3: 804dab9e1a7 api-trace2.txt: elminate section describing the public trace2 API
4: 637b422b860 ! 4: 9adf9cee1a9 trace2: rename the thread_name argument to trace2_thread_start
@@ trace2/tr2_tls.c: struct tr2tls_thread_ctx *tr2tls_create_self(const char *threa
## trace2/tr2_tls.h ##
@@ trace2/tr2_tls.h: struct tr2tls_thread_ctx {
- /*
- * Create thread-local storage for the current thread.
- *
-- * We assume the first thread is "main". Other threads are given
-- * non-zero thread-ids to help distinguish messages from concurrent
-- * threads.
-- *
-- * Truncate the thread name if necessary to help with column alignment
-- * in printf-style messages.
-+ * The first thread in the process will have:
-+ * { .thread_id=0, .thread_name="main" }
-+ * Subsequent threads are given a non-zero thread_id and a thread_name
-+ * constructed from the id and a thread base name (which is usually just
-+ * the name of the thread-proc function). For example:
-+ * { .thread_id=10, .thread_name="th10fsm-listen" }
-+ * This helps to identify and distinguish messages from concurrent threads.
-+ * The ctx.thread_name field is truncated if necessary to help with column
-+ * alignment in printf-style messages.
- *
* In this and all following functions the term "self" refers to the
* current thread.
*/
-: ----------- > 5: 8cb206b7632 trace2: improve thread-name documentation in the thread-context
5: 4bf78e356e2 = 6: 8a89e1aa238 trace2: convert ctx.thread_name from strbuf to pointer
6: dd6d8e2841b ! 7: 8e701109976 trace2: add stopwatch timers
@@ trace2/tr2_tgt.h
struct json_writer;
+struct tr2_timer_metadata;
+struct tr2_timer;
++
++#define NS_PER_SEC_D ((double)1000*1000*1000)
/*
* Function prototypes for a TRACE2 "target" vtable.
@@ trace2/tr2_tgt_event.c: static void fn_data_json_fl(const char *file, int line,
+{
+ const char *event_name = is_final_data ? "timer" : "th_timer";
+ struct json_writer jw = JSON_WRITER_INIT;
-+ double t_total = ((double)timer->total_ns) / 1000000000.0;
-+ double t_min = ((double)timer->min_ns) / 1000000000.0;
-+ double t_max = ((double)timer->max_ns) / 1000000000.0;
++ double t_total = ((double)timer->total_ns) / NS_PER_SEC_D;
++ double t_min = ((double)timer->min_ns) / NS_PER_SEC_D;
++ double t_max = ((double)timer->max_ns) / NS_PER_SEC_D;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw);
@@ trace2/tr2_tgt_normal.c: static void fn_printf_va_fl(const char *file, int line,
+{
+ const char *event_name = is_final_data ? "timer" : "th_timer";
+ struct strbuf buf_payload = STRBUF_INIT;
-+ double t_total = ((double)timer->total_ns) / 1000000000.0;
-+ double t_min = ((double)timer->min_ns) / 1000000000.0;
-+ double t_max = ((double)timer->max_ns) / 1000000000.0;
++ double t_total = ((double)timer->total_ns) / NS_PER_SEC_D;
++ double t_min = ((double)timer->min_ns) / NS_PER_SEC_D;
++ double t_max = ((double)timer->max_ns) / NS_PER_SEC_D;
+
+ strbuf_addf(&buf_payload, ("%s %s/%s"
+ " intervals:%"PRIu64
@@ trace2/tr2_tgt_perf.c: static void fn_printf_va_fl(const char *file, int line,
+{
+ const char *event_name = is_final_data ? "timer" : "th_timer";
+ struct strbuf buf_payload = STRBUF_INIT;
-+ double t_total = ((double)timer->total_ns) / 1000000000.0;
-+ double t_min = ((double)timer->min_ns) / 1000000000.0;
-+ double t_max = ((double)timer->max_ns) / 1000000000.0;
++ double t_total = ((double)timer->total_ns) / NS_PER_SEC_D;
++ double t_min = ((double)timer->min_ns) / NS_PER_SEC_D;
++ double t_max = ((double)timer->max_ns) / NS_PER_SEC_D;
+
+ strbuf_addf(&buf_payload, ("name:%s"
+ " intervals:%"PRIu64
7: cf012fcde37 ! 8: 5cd8bdde884 trace2: add global counter mechanism
@@ trace2/tr2_tgt.h: struct repository;
+struct tr2_counter_metadata;
+struct tr2_counter;
- /*
- * Function prototypes for a TRACE2 "target" vtable.
+ #define NS_PER_SEC_D ((double)1000*1000*1000)
+
@@ trace2/tr2_tgt.h: typedef void(tr2_tgt_evt_timer_t)(const struct tr2_timer_metadata *meta,
const struct tr2_timer *timer,
int is_final_data);
--
gitgitgadget
next prev parent reply other threads:[~2022-10-20 18:28 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 16:19 [PATCH 0/9] Trace2 timers and counters and some cleanup Jeff Hostetler via GitGitGadget
2022-10-04 16:19 ` [PATCH 1/9] builtin/merge-file: fix compiler warning on MacOS with clang 11.0.0 Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 2/9] builtin/unpack-objects.c: " Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 3/9] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 4/9] tr2tls: clarify TLS terminology Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 5/9] trace2: rename trace2 thread_name argument as name_hint Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 6/9] trace2: convert ctx.thread_name to flex array Jeff Hostetler via GitGitGadget
2022-10-05 11:14 ` Ævar Arnfjörð Bjarmason
2022-10-06 16:28 ` Jeff Hostetler
2022-10-10 18:31 ` Jeff Hostetler
2022-10-05 18:03 ` Junio C Hamano
2022-10-06 21:05 ` Ævar Arnfjörð Bjarmason
2022-10-06 21:50 ` Junio C Hamano
2022-10-07 1:10 ` [RFC PATCH] trace2 API: don't save a copy of constant "thread_name" Ævar Arnfjörð Bjarmason
2022-10-07 1:16 ` Junio C Hamano
2022-10-07 10:03 ` Ævar Arnfjörð Bjarmason
2022-10-10 19:16 ` Jeff Hostetler
2022-10-11 13:31 ` Ævar Arnfjörð Bjarmason
2022-10-12 13:31 ` Jeff Hostetler
2022-10-10 19:05 ` Jeff Hostetler
2022-10-11 12:52 ` Ævar Arnfjörð Bjarmason
2022-10-11 14:40 ` Junio C Hamano
2022-10-10 18:39 ` [PATCH 6/9] trace2: convert ctx.thread_name to flex array Jeff Hostetler
2022-10-04 16:20 ` [PATCH 7/9] api-trace2.txt: elminate section describing the public trace2 API Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 8/9] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2022-10-04 16:20 ` [PATCH 9/9] trace2: add global counter mechanism Jeff Hostetler via GitGitGadget
2022-10-05 13:04 ` [PATCH 0/9] Trace2 timers and counters and some cleanup Ævar Arnfjörð Bjarmason
2022-10-06 15:45 ` Jeff Hostetler
2022-10-06 18:12 ` Derrick Stolee
2022-10-12 18:52 ` [PATCH v2 0/7] " Jeff Hostetler via GitGitGadget
2022-10-12 18:52 ` [PATCH v2 1/7] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2022-10-12 18:52 ` [PATCH v2 2/7] tr2tls: clarify TLS terminology Jeff Hostetler via GitGitGadget
2022-10-13 21:12 ` Junio C Hamano
2022-10-12 18:52 ` [PATCH v2 3/7] api-trace2.txt: elminate section describing the public trace2 API Jeff Hostetler via GitGitGadget
2022-10-12 18:52 ` [PATCH v2 4/7] trace2: rename the thread_name argument to trace2_thread_start Jeff Hostetler via GitGitGadget
2022-10-12 21:06 ` Ævar Arnfjörð Bjarmason
2022-10-20 14:40 ` Jeff Hostetler
2022-10-13 21:12 ` Junio C Hamano
2022-10-12 18:52 ` [PATCH v2 5/7] trace2: convert ctx.thread_name from strbuf to pointer Jeff Hostetler via GitGitGadget
2022-10-13 21:12 ` Junio C Hamano
2022-10-12 18:52 ` [PATCH v2 6/7] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2022-10-13 21:12 ` Junio C Hamano
2022-10-20 14:42 ` Jeff Hostetler
2022-10-12 18:52 ` [PATCH v2 7/7] trace2: add global counter mechanism Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` Jeff Hostetler via GitGitGadget [this message]
2022-10-20 18:28 ` [PATCH v3 1/8] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` [PATCH v3 2/8] tr2tls: clarify TLS terminology Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` [PATCH v3 3/8] api-trace2.txt: elminate section describing the public trace2 API Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` [PATCH v3 4/8] trace2: rename the thread_name argument to trace2_thread_start Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` [PATCH v3 5/8] trace2: improve thread-name documentation in the thread-context Jeff Hostetler via GitGitGadget
2022-10-20 18:57 ` Ævar Arnfjörð Bjarmason
2022-10-20 20:15 ` Jeff Hostetler
2022-10-20 18:28 ` [PATCH v3 6/8] trace2: convert ctx.thread_name from strbuf to pointer Jeff Hostetler via GitGitGadget
2022-10-20 18:28 ` [PATCH v3 7/8] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2022-10-20 20:25 ` Junio C Hamano
2022-10-20 20:52 ` Jeff Hostetler
2022-10-20 20:55 ` Junio C Hamano
2022-10-21 21:51 ` Jeff Hostetler
2022-10-20 18:28 ` [PATCH v3 8/8] trace2: add global counter mechanism Jeff Hostetler via GitGitGadget
2022-10-24 13:40 ` [PATCH v4 0/8] Trace2 timers and counters and some cleanup Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 1/8] trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx Jeff Hostetler via GitGitGadget
2022-10-24 20:31 ` Junio C Hamano
2022-10-25 12:35 ` Derrick Stolee
2022-10-25 15:40 ` Junio C Hamano
2022-10-24 13:41 ` [PATCH v4 2/8] tr2tls: clarify TLS terminology Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 3/8] api-trace2.txt: elminate section describing the public trace2 API Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 4/8] trace2: rename the thread_name argument to trace2_thread_start Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 5/8] trace2: improve thread-name documentation in the thread-context Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 6/8] trace2: convert ctx.thread_name from strbuf to pointer Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 7/8] trace2: add stopwatch timers Jeff Hostetler via GitGitGadget
2022-10-24 13:41 ` [PATCH v4 8/8] trace2: add global counter mechanism Jeff Hostetler via GitGitGadget
2022-10-25 12:27 ` [PATCH v4 0/8] Trace2 timers and counters and some cleanup Derrick Stolee
2022-10-25 15:36 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1373.v3.git.1666290489.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@jeffhostetler.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).