On 12/20/2021 10:01 AM, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
>
> Add a stopwatch timer mechanism to Git.
> +static void *ut_009timer_thread_proc(void *_ut_009_data)
> +{
> + struct ut_009_data *data = _ut_009_data;
> + int k;
> +
> + trace2_thread_start("ut_009");
> +
> + for (k = 0; k < data->count; k++) {
> + trace2_timer_start(TRACE2_TIMER_ID_TEST2);
> + sleep_millisec(data->delay);
> + trace2_timer_stop(TRACE2_TIMER_ID_TEST2);
> + }
> +
> + trace2_thread_exit();
> + return NULL;
> +}
> +
> +
nit: double newline.
> +# Exercise the stopwatch timer "test" in a loop and confirm that it was
> +# we have as many start/stop intervals as expected. We cannot really test
> +# the (elapsed, min, max) timer values, so we assume they are good.
We can't check their values, but we could check that their labels are
emitted.
> +test_expect_success 'test stopwatch timers - summary only' '
> + test_when_finished "rm trace.perf actual" &&
> + test_config_global trace2.perfBrief 1 &&
> + test_config_global trace2.perfTarget "$(pwd)/trace.perf" &&
> + test-tool trace2 008timer 5 10 &&
> + perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
> + grep "d0|summary|timer||_T_ABS_||test|name:test1 count:5" actual
adding something like " total:.* min: .* max:.*" to the end of this
pattern might be good. You could even get really specific about the ".*"
being a floating point number, but I'm not too concerned about that. I
just want to see that these other labels stay consistent in future Git
versions.
> +# Exercise the stopwatch timer "test" in a loop and confirm that it was
> +# we have as many start/stop intervals as expected. We cannot really test
> +# the (t_timer, t_min, t_max) timer values, so we assume they are good.
Similar, we can do something such as...
> +have_timer_event () {
> + thread=$1
> + name=$2
> + count=$3
> + file=$4
> +
> + grep "\"event\":\"timer\".*\"thread\":\"${thread}\".*\"name\":\"${name}\".*\"count\":${count}" $file
Adding more detail to this pattern.
This helper could probably benefit from constructing the regex across
multiple string concatenations, so we can see the different pieces.
Something like
pattern="\"event\":\"timer\""
pattern="$pattern.*\"thread\":\"${thread}\""
pattern="$pattern.*\"name\":\"${name}\""
pattern="$pattern.*\"count\":\"${count}\""
pattern="$pattern.*\"t_total\":"
pattern="$pattern.*\"t_min\":"
pattern="$pattern.*\"t_max\":"
grep "$pattern" $file
> +
> + return $?
If we used && throughout this method, would this return not be
necessary?
> +static void tr2main_emit_summary_timers(uint64_t us_elapsed_absolute)
> +{
> + struct tr2_tgt *tgt_j;
> + int j;
> + struct tr2tmr_block merged;
> +
> + memset(&merged, 0, sizeof(merged));
> +
> + /*
> + * Sum across all of the per-thread stopwatch timer data into
> + * a single composite block of timer values.
> + */
> + tr2tls_aggregate_timer_blocks(&merged);
> +
> + /*
> + * Emit "summary" timer events for each composite timer value
> + * that had activity.
> + */
> + for_each_wanted_builtin (j, tgt_j)
> + if (tgt_j->pfn_timer)
> + tr2tmr_emit_block(tgt_j->pfn_timer,
> + us_elapsed_absolute,
> + &merged, "summary");
I'd put braces at the for-loop level, even though this is semantically
correct without them.
> +}
> +
> +static void tr2main_emit_thread_timers(uint64_t us_elapsed_absolute)
> +{
> + struct tr2_tgt *tgt_j;
> + int j;
> +
> + for_each_wanted_builtin (j, tgt_j)
> + if (tgt_j->pfn_timer)
> + tr2tls_emit_timer_blocks_by_thread(tgt_j->pfn_timer,
> + us_elapsed_absolute);
(same here)
> +/*
> + * Define the set of stopwatch timers.
> + *
> + * We can add more at any time, but they must be defined at compile
> + * time (to avoid the need to dynamically allocate and synchronize
> + * them between different threads).
> + *
> + * These must start at 0 and be contiguous (because we use them
> + * elsewhere as array indexes).
I was worried at first about using an array here, but this is essentially
one chunk of global memory per process that will not be very large, even
if we add a lot of timer IDs here. If we use this API enough that that
memory is a problem, then we can refactor the memory to be a hashmap that
only populates entries for IDs that are used by the process.
> + * Any values added to this enum must also be added to the timer definitions
> + * array. See `trace2/tr2_tmr.c:tr2tmr_def_block[]`.
> + */
> +enum trace2_timer_id {
> + /*
> + * Define two timers for testing. See `t/helper/test-trace2.c`.
> + * These can be used for ad hoc testing, but should not be used
> + * for permanent analysis code.
> + */
> + TRACE2_TIMER_ID_TEST1 = 0, /* emits summary event only */
> + TRACE2_TIMER_ID_TEST2, /* emits summary and thread events */
> +
> +
> + /* Add additional timer definitions before here. */
> + TRACE2_NUMBER_OF_TIMERS
> +};
...
> +static struct tr2tmr_def tr2tmr_def_block[TRACE2_NUMBER_OF_TIMERS] = {
> + [TRACE2_TIMER_ID_TEST1] = { "test", "test1", 0 },
> + [TRACE2_TIMER_ID_TEST2] = { "test", "test2", 1 },
> +};
Although this will always be populated, so maybe my thoughts about how
to reduce memory load in the hypothetical future are worthless.
> +void tr2tmr_start(enum trace2_timer_id tid)
> +{
> + struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
> + struct tr2tmr_timer *t = &ctx->timers.timer[tid];
> +
> + t->recursion_count++;
> + if (t->recursion_count > 1)
> + return; /* ignore recursive starts */
> +
> + t->start_us = getnanotime() / 1000;
Using nanotime gives us the best precision available, and dividing
by 1000 will lose some precision. This is likely why we saw some
0.000000 values for t_min in some of your experiments. That should
be rare for real uses of this API (such as wrapping lstat() calls).
But why do we divide by 1000 here at all? 2^63 nanoseconds is
still 292 years, so we don't risk overflow. You specify uint64_t
so this isn't different on 32-bit machines.
Thanks,
-Stolee
