wrapper: use trace2 counters to collect fsync stats

As mentioned in the thread starting at [1], trace2 counters should be
used to count events instead of ad-hoc static variables.

Convert the two fsync static variables to trace2 counters, reducing the
coupling between wrapper.c and the trace2 subsystem. Adjust t/t5351 to
match the trace2 counter output format.

The counters are not per-thread because the ones being replaced also
were not.

[1] https://lore.kernel.org/git/20230627195251.1973421-2-calvinwan@google.com/

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Beat Bolli
2023-07-20 18:48:23 +02:00
committed by Junio C Hamano
parent cba07a324d
commit a27eecea75
6 changed files with 19 additions and 26 deletions

View File

@ -55,7 +55,7 @@ check_fsync_events () {
cat >expect &&
sed -n \
-e '/^{"event":"data",.*"category":"fsync",/ {
-e '/^{"event":"counter",.*"category":"fsync",/ {
s/.*"category":"fsync",//;
s/}$//;
p;
@ -78,8 +78,8 @@ test_expect_success 'unpack big object in stream (core.fsyncmethod=batch)' '
flush_count=1
fi &&
check_fsync_events trace2.txt <<-EOF &&
"key":"fsync/writeout-only","value":"6"
"key":"fsync/hardware-flush","value":"$flush_count"
"name":"writeout-only","count":6
"name":"hardware-flush","count":$flush_count
EOF
test_dir_is_empty dest.git/objects/pack &&