linux-kernel - Re: [PATCH v4 2/9] perf annotate: Remove __annotation_line_

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAP-5=fVG6q37_tVvFo12OCiiE4zu0fqkf_3Z1rmoanVLXR7DOA@mail.gmail.com>
Date: Fri, 25 Jul 2025 17:20:28 -0700
From: Ian Rogers <irogers@...gle.com>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Arnaldo Carvalho de Melo <acme@...nel.org>, Kan Liang <kan.liang@...ux.intel.com>, 
	Jiri Olsa <jolsa@...nel.org>, Adrian Hunter <adrian.hunter@...el.com>, 
	Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...nel.org>, 
	LKML <linux-kernel@...r.kernel.org>, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH v4 2/9] perf annotate: Remove __annotation_line__write()

On Fri, Jul 25, 2025 at 12:38 PM Namhyung Kim <namhyung@...nel.org> wrote:
>
> Get rid of the internal function and convert function arguments into
> local variables if they are used more than once.
>
> Signed-off-by: Namhyung Kim <namhyung@...nel.org>
> ---
>  tools/perf/util/annotate.c | 46 ++++++++++++++++----------------------
>  1 file changed, 19 insertions(+), 27 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 0dd475a744b6dfac..69ee83052396b15e 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1935,24 +1935,26 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr,
>         return -ENOMEM;
>  }
>
> -static void __annotation_line__write(struct annotation_line *al, struct annotation *notes,
> -                                    bool first_line, bool current_entry, bool change_color, int width,
> -                                    void *obj, unsigned int percent_type,
> -                                    int  (*obj__set_color)(void *obj, int color),
> -                                    void (*obj__set_percent_color)(void *obj, double percent, bool current),
> -                                    int  (*obj__set_jumps_percent_color)(void *obj, int nr, bool current),
> -                                    void (*obj__printf)(void *obj, const char *fmt, ...),
> -                                    void (*obj__write_graph)(void *obj, int graph))
> -
> -{
> -       double percent_max = annotation_line__max_percent(al, percent_type);
> -       int pcnt_width = annotation__pcnt_width(notes),
> -           cycles_width = annotation__cycles_width(notes);
> +void annotation_line__write(struct annotation_line *al, struct annotation *notes,
> +                           struct annotation_write_ops *wops)

nit: constify wops? If its const are the local variables worth it?

Thanks,
Ian

> +{
> +       bool current_entry = wops->current_entry;
> +       bool change_color = wops->change_color;
> +       double percent_max = annotation_line__max_percent(al, annotate_opts.percent_type);
> +       int width = wops->width;
> +       int pcnt_width = annotation__pcnt_width(notes);
> +       int cycles_width = annotation__cycles_width(notes);
>         bool show_title = false;
>         char bf[256];
>         int printed;
> -
> -       if (first_line && (al->offset == -1 || percent_max == 0.0)) {
> +       void *obj = wops->obj;
> +       int  (*obj__set_color)(void *obj, int color) = wops->set_color;
> +       void (*obj__set_percent_color)(void *obj, double percent, bool current) = wops->set_percent_color;
> +       int  (*obj__set_jumps_percent_color)(void *obj, int nr, bool current) = wops->set_jumps_percent_color;
> +       void (*obj__printf)(void *obj, const char *fmt, ...) = wops->printf;
> +       void (*obj__write_graph)(void *obj, int graph) = wops->write_graph;
> +
> +       if (wops->first_line && (al->offset == -1 || percent_max == 0.0)) {
>                 if (notes->branch && al->cycles) {
>                         if (al->cycles->ipc == 0.0 && al->cycles->avg == 0)
>                                 show_title = true;
> @@ -1966,7 +1968,8 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
>                 for (i = 0; i < al->data_nr; i++) {
>                         double percent;
>
> -                       percent = annotation_data__percent(&al->data[i], percent_type);
> +                       percent = annotation_data__percent(&al->data[i],
> +                                                          annotate_opts.percent_type);
>
>                         obj__set_percent_color(obj, percent, current_entry);
>                         if (symbol_conf.show_total_period) {
> @@ -2115,17 +2118,6 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
>
>  }
>
> -void annotation_line__write(struct annotation_line *al, struct annotation *notes,
> -                           struct annotation_write_ops *wops)
> -{
> -       __annotation_line__write(al, notes, wops->first_line, wops->current_entry,
> -                                wops->change_color, wops->width, wops->obj,
> -                                annotate_opts.percent_type,
> -                                wops->set_color, wops->set_percent_color,
> -                                wops->set_jumps_percent_color, wops->printf,
> -                                wops->write_graph);
> -}
> -
>  int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
>                       struct arch **parch)
>  {
> --
> 2.50.1
>