Re: [PATCH 4/9] perf stat: Move common code in print_metric_headers()

From: Ian Rogers
Date: Tue Nov 08 2022 - 18:20:01 EST


On Mon, Nov 7, 2022 at 1:33 PM Namhyung Kim <namhyung@xxxxxxxxxx> wrote:
>
> The struct perf_stat_output_ctx is set in a loop with the same values.
> Move the code out of the loop and keep the loop minimal.
>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

Acked-by: Ian Rogers <irogers@xxxxxxxxxx>
Could also potentially make it const, but functions it is passed to
would also need changing.

Thanks,
Ian

> ---
> tools/perf/util/stat-display.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index d4936a502560..115477461224 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -837,11 +837,16 @@ static void print_metric_headers(struct perf_stat_config *config,
> struct evlist *evlist,
> const char *prefix, bool no_indent)
> {
> - struct perf_stat_output_ctx out;
> struct evsel *counter;
> struct outstate os = {
> .fh = config->output
> };
> + struct perf_stat_output_ctx out = {
> + .ctx = &os,
> + .print_metric = print_metric_header,
> + .new_line = new_line_metric,
> + .force_header = true,
> + };
> bool first = true;
>
> if (config->json_output && !config->interval)
> @@ -865,13 +870,11 @@ static void print_metric_headers(struct perf_stat_config *config,
> /* Print metrics headers only */
> evlist__for_each_entry(evlist, counter) {
> os.evsel = counter;
> - out.ctx = &os;
> - out.print_metric = print_metric_header;
> +
> if (!first && config->json_output)
> fprintf(config->output, ", ");
> first = false;
> - out.new_line = new_line_metric;
> - out.force_header = true;
> +
> perf_stat__print_shadow_stats(config, counter, 0,
> 0,
> &out,
> --
> 2.38.1.431.g37b22c650d-goog
>