diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:45 -0700 |
| commit | d98abce68f4bd79aa29c66497a5eda3415668430 (patch) | |
| tree | 0dfd8a322173f6ede29dc1248f9653952f110636 /t | |
| parent | Merge branch 'jt/t5500-unflake' (diff) | |
| parent | trace2: log progress time and throughput (diff) | |
| download | tgif-d98abce68f4bd79aa29c66497a5eda3415668430.tar.xz | |
Merge branch 'es/trace-log-progress'
Teach codepaths that show progress meter to also use the
start_progress() and the stop_progress() calls as a "region" to be
traced.
* es/trace-log-progress:
trace2: log progress time and throughput
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0500-progress-display.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh index d2d088d9a0..1ed1df351c 100755 --- a/t/t0500-progress-display.sh +++ b/t/t0500-progress-display.sh @@ -283,4 +283,30 @@ test_expect_success 'cover up after throughput shortens a lot' ' test_i18ncmp expect out ' +test_expect_success 'progress generates traces' ' + cat >in <<-\EOF && + throughput 102400 1000 + update + progress 10 + throughput 204800 2000 + update + progress 20 + throughput 307200 3000 + update + progress 30 + throughput 409600 4000 + update + progress 40 + EOF + + GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress --total=40 \ + "Working hard" <in 2>stderr && + + # t0212/parse_events.perl intentionally omits regions and data. + grep -e "region_enter" -e "\"category\":\"progress\"" trace.event && + grep -e "region_leave" -e "\"category\":\"progress\"" trace.event && + grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event && + grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event +' + test_done |