It will be used for data type display later.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/ui/browsers/annotate.c | 13 ++++++++++--
tools/perf/util/annotate.c | 35 +++++++++++++++++--------------
tools/perf/util/annotate.h | 15 +++++++++++--
3 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 28ef146f29e8e742..23bea5b165774ae7 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -28,6 +28,8 @@ struct annotate_browser {
struct annotation_line *selection;
struct arch *arch;
struct hist_entry *he;
+ struct debuginfo *dbg;
+ struct evsel *evsel;
bool searching_backwards;
char search_bf[128];
};
@@ -108,12 +110,18 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
.printf = annotate_browser__printf,
.write_graph = annotate_browser__write_graph,
};
+ struct annotation_print_data apd = {
+ .he = ab->he,
+ .arch = ab->arch,
+ .evsel = ab->evsel,
+ .dbg = ab->dbg,
+ };
/* The scroll bar isn't being used */
if (!browser->navkeypressed)
ops.width += 1;
- annotation_line__write(al, notes, &ops);
+ annotation_line__write(al, notes, &ops, &apd);
if (ops.current_entry)
ab->selection = al;
@@ -976,7 +984,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
continue;
}
case 'P':
- map_symbol__annotation_dump(ms, evsel);
+ map_symbol__annotation_dump(ms, evsel, browser->he);
continue;
case 't':
if (symbol_conf.show_total_period) {
@@ -1061,6 +1069,7 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
.use_navkeypressed = true,
},
.he = he,
+ .evsel = evsel,
};
struct dso *dso;
int ret = -1, err;
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 69ee83052396b15e..c21152710148b68c 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -765,15 +765,6 @@ __hist_entry__get_data_type(struct hist_entry *he, struct arch *arch,
struct debuginfo *dbg, struct disasm_line *dl,
int *type_offset);
-struct annotation_print_data {
- struct hist_entry *he;
- struct evsel *evsel;
- struct arch *arch;
- struct debuginfo *dbg;
- u64 start;
- int addr_fmt_width;
-};
-
static int
annotation_line__print(struct annotation_line *al, struct annotation_print_data *apd,
struct annotation_options *opts, int printed,
@@ -1230,7 +1221,6 @@ int hist_entry__annotate_printf(struct hist_entry *he, struct evsel *evsel)
struct annotation_print_data apd = {
.he = he,
.evsel = evsel,
- .start = map__rip_2objdump(map, sym->start),
};
int printed = 2, queue_len = 0;
int more = 0;
@@ -1357,7 +1347,8 @@ static void FILE__write_graph(void *fp, int graph)
fputs(s, fp);
}
-static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
+static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp,
+ struct annotation_print_data *apd)
{
struct annotation *notes = symbol__annotation(sym);
struct annotation_write_ops wops = {
@@ -1374,7 +1365,7 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
list_for_each_entry(al, ¬es->src->source, node) {
if (annotation_line__filter(al))
continue;
- annotation_line__write(al, notes, &wops);
+ annotation_line__write(al, notes, &wops, apd);
fputc('\n', fp);
wops.first_line = false;
}
@@ -1382,13 +1373,18 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
return 0;
}
-int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel)
+int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
+ struct hist_entry *he)
{
const char *ev_name = evsel__name(evsel);
char buf[1024];
char *filename;
int err = -1;
FILE *fp;
+ struct annotation_print_data apd = {
+ .he = he,
+ .evsel = evsel,
+ };
if (asprintf(&filename, "%s.annotation", ms->sym->name) < 0)
return -1;
@@ -1404,7 +1400,7 @@ int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel)
fprintf(fp, "%s() %s\nEvent: %s\n\n",
ms->sym->name, dso__long_name(map__dso(ms->map)), ev_name);
- symbol__annotate_fprintf2(ms->sym, fp);
+ symbol__annotate_fprintf2(ms->sym, fp, &apd);
fclose(fp);
err = 0;
@@ -1656,6 +1652,10 @@ int hist_entry__tty_annotate2(struct hist_entry *he, struct evsel *evsel)
struct symbol *sym = ms->sym;
struct rb_root source_line = RB_ROOT;
struct hists *hists = evsel__hists(evsel);
+ struct annotation_print_data apd = {
+ .he = he,
+ .evsel = evsel,
+ };
char buf[1024];
int err;
@@ -1678,7 +1678,7 @@ int hist_entry__tty_annotate2(struct hist_entry *he, struct evsel *evsel)
hists__scnprintf_title(hists, buf, sizeof(buf));
fprintf(stdout, "%s, [percent: %s]\n%s() %s\n",
buf, percent_type_str(annotate_opts.percent_type), sym->name, dso__long_name(dso));
- symbol__annotate_fprintf2(sym, stdout);
+ symbol__annotate_fprintf2(sym, stdout, &apd);
annotated_source__purge(symbol__annotation(sym)->src);
@@ -1936,7 +1936,8 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr,
}
void annotation_line__write(struct annotation_line *al, struct annotation *notes,
- struct annotation_write_ops *wops)
+ struct annotation_write_ops *wops,
+ struct annotation_print_data *apd)
{
bool current_entry = wops->current_entry;
bool change_color = wops->change_color;
@@ -2114,6 +2115,8 @@ void annotation_line__write(struct annotation_line *al, struct annotation *notes
disasm_line__write(disasm_line(al), notes, obj, bf, sizeof(bf), obj__printf, obj__write_graph);
obj__printf(obj, "%-*s", width - pcnt_width - cycles_width - 3 - printed, bf);
+
+ (void)apd;
}
}
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 0f640e4871744262..8fad464a870a2b8e 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -199,8 +199,18 @@ struct annotation_write_ops {
void (*write_graph)(void *obj, int graph);
};
+struct annotation_print_data {
+ struct hist_entry *he;
+ struct evsel *evsel;
+ struct arch *arch;
+ struct debuginfo *dbg;
+ u64 start;
+ int addr_fmt_width;
+};
+
void annotation_line__write(struct annotation_line *al, struct annotation *notes,
- struct annotation_write_ops *ops);
+ struct annotation_write_ops *ops,
+ struct annotation_print_data *apd);
int __annotation__scnprintf_samples_period(struct annotation *notes,
char *bf, size_t size,
@@ -463,7 +473,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, struct evsel *evsel);
void symbol__annotate_decay_histogram(struct symbol *sym, struct evsel *evsel);
void annotated_source__purge(struct annotated_source *as);
-int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel);
+int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
+ struct hist_entry *he);
bool ui__has_annotation(void);
--
2.50.1On Fri, Jul 25, 2025 at 12:38 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> It will be used for data type display later.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/ui/browsers/annotate.c | 13 ++++++++++--
> tools/perf/util/annotate.c | 35 +++++++++++++++++--------------
> tools/perf/util/annotate.h | 15 +++++++++++--
> 3 files changed, 43 insertions(+), 20 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
> index 28ef146f29e8e742..23bea5b165774ae7 100644
> --- a/tools/perf/ui/browsers/annotate.c
> +++ b/tools/perf/ui/browsers/annotate.c
> @@ -28,6 +28,8 @@ struct annotate_browser {
> struct annotation_line *selection;
> struct arch *arch;
> struct hist_entry *he;
> + struct debuginfo *dbg;
> + struct evsel *evsel;
> bool searching_backwards;
> char search_bf[128];
> };
> @@ -108,12 +110,18 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
> .printf = annotate_browser__printf,
> .write_graph = annotate_browser__write_graph,
> };
> + struct annotation_print_data apd = {
> + .he = ab->he,
> + .arch = ab->arch,
> + .evsel = ab->evsel,
> + .dbg = ab->dbg,
> + };
>
> /* The scroll bar isn't being used */
> if (!browser->navkeypressed)
> ops.width += 1;
>
> - annotation_line__write(al, notes, &ops);
> + annotation_line__write(al, notes, &ops, &apd);
>
> if (ops.current_entry)
> ab->selection = al;
> @@ -976,7 +984,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
> continue;
> }
> case 'P':
> - map_symbol__annotation_dump(ms, evsel);
> + map_symbol__annotation_dump(ms, evsel, browser->he);
> continue;
> case 't':
> if (symbol_conf.show_total_period) {
> @@ -1061,6 +1069,7 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
> .use_navkeypressed = true,
> },
> .he = he,
> + .evsel = evsel,
> };
> struct dso *dso;
> int ret = -1, err;
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 69ee83052396b15e..c21152710148b68c 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -765,15 +765,6 @@ __hist_entry__get_data_type(struct hist_entry *he, struct arch *arch,
> struct debuginfo *dbg, struct disasm_line *dl,
> int *type_offset);
>
> -struct annotation_print_data {
> - struct hist_entry *he;
> - struct evsel *evsel;
> - struct arch *arch;
> - struct debuginfo *dbg;
> - u64 start;
> - int addr_fmt_width;
> -};
> -
> static int
> annotation_line__print(struct annotation_line *al, struct annotation_print_data *apd,
> struct annotation_options *opts, int printed,
> @@ -1230,7 +1221,6 @@ int hist_entry__annotate_printf(struct hist_entry *he, struct evsel *evsel)
> struct annotation_print_data apd = {
> .he = he,
> .evsel = evsel,
> - .start = map__rip_2objdump(map, sym->start),
> };
> int printed = 2, queue_len = 0;
> int more = 0;
> @@ -1357,7 +1347,8 @@ static void FILE__write_graph(void *fp, int graph)
> fputs(s, fp);
> }
>
> -static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
> +static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp,
> + struct annotation_print_data *apd)
> {
> struct annotation *notes = symbol__annotation(sym);
> struct annotation_write_ops wops = {
> @@ -1374,7 +1365,7 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
> list_for_each_entry(al, ¬es->src->source, node) {
> if (annotation_line__filter(al))
> continue;
> - annotation_line__write(al, notes, &wops);
> + annotation_line__write(al, notes, &wops, apd);
> fputc('\n', fp);
> wops.first_line = false;
> }
> @@ -1382,13 +1373,18 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
> return 0;
> }
>
> -int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel)
> +int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
> + struct hist_entry *he)
> {
> const char *ev_name = evsel__name(evsel);
> char buf[1024];
> char *filename;
> int err = -1;
> FILE *fp;
> + struct annotation_print_data apd = {
> + .he = he,
> + .evsel = evsel,
> + };
>
> if (asprintf(&filename, "%s.annotation", ms->sym->name) < 0)
> return -1;
> @@ -1404,7 +1400,7 @@ int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel)
>
> fprintf(fp, "%s() %s\nEvent: %s\n\n",
> ms->sym->name, dso__long_name(map__dso(ms->map)), ev_name);
> - symbol__annotate_fprintf2(ms->sym, fp);
> + symbol__annotate_fprintf2(ms->sym, fp, &apd);
>
> fclose(fp);
> err = 0;
> @@ -1656,6 +1652,10 @@ int hist_entry__tty_annotate2(struct hist_entry *he, struct evsel *evsel)
> struct symbol *sym = ms->sym;
> struct rb_root source_line = RB_ROOT;
> struct hists *hists = evsel__hists(evsel);
> + struct annotation_print_data apd = {
> + .he = he,
> + .evsel = evsel,
> + };
> char buf[1024];
> int err;
>
> @@ -1678,7 +1678,7 @@ int hist_entry__tty_annotate2(struct hist_entry *he, struct evsel *evsel)
> hists__scnprintf_title(hists, buf, sizeof(buf));
> fprintf(stdout, "%s, [percent: %s]\n%s() %s\n",
> buf, percent_type_str(annotate_opts.percent_type), sym->name, dso__long_name(dso));
> - symbol__annotate_fprintf2(sym, stdout);
> + symbol__annotate_fprintf2(sym, stdout, &apd);
>
> annotated_source__purge(symbol__annotation(sym)->src);
>
> @@ -1936,7 +1936,8 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr,
> }
>
> void annotation_line__write(struct annotation_line *al, struct annotation *notes,
> - struct annotation_write_ops *wops)
> + struct annotation_write_ops *wops,
> + struct annotation_print_data *apd)
> {
> bool current_entry = wops->current_entry;
> bool change_color = wops->change_color;
> @@ -2114,6 +2115,8 @@ void annotation_line__write(struct annotation_line *al, struct annotation *notes
> disasm_line__write(disasm_line(al), notes, obj, bf, sizeof(bf), obj__printf, obj__write_graph);
>
> obj__printf(obj, "%-*s", width - pcnt_width - cycles_width - 3 - printed, bf);
> +
> + (void)apd;
> }
>
> }
> diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
> index 0f640e4871744262..8fad464a870a2b8e 100644
> --- a/tools/perf/util/annotate.h
> +++ b/tools/perf/util/annotate.h
> @@ -199,8 +199,18 @@ struct annotation_write_ops {
> void (*write_graph)(void *obj, int graph);
> };
>
> +struct annotation_print_data {
> + struct hist_entry *he;
> + struct evsel *evsel;
> + struct arch *arch;
> + struct debuginfo *dbg;
> + u64 start;
> + int addr_fmt_width;
> +};
nit: As the scope of this is now global, is it worth commenting it?
For example, where is start relative to?
Reviewed-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
> +
> void annotation_line__write(struct annotation_line *al, struct annotation *notes,
> - struct annotation_write_ops *ops);
> + struct annotation_write_ops *ops,
> + struct annotation_print_data *apd);
>
> int __annotation__scnprintf_samples_period(struct annotation *notes,
> char *bf, size_t size,
> @@ -463,7 +473,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, struct evsel *evsel);
> void symbol__annotate_decay_histogram(struct symbol *sym, struct evsel *evsel);
> void annotated_source__purge(struct annotated_source *as);
>
> -int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel);
> +int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
> + struct hist_entry *he);
>
> bool ui__has_annotation(void);
>
> --
> 2.50.1
>
On Fri, Jul 25, 2025 at 05:23:00PM -0700, Ian Rogers wrote:
> On Fri, Jul 25, 2025 at 12:38 PM Namhyung Kim <namhyung@kernel.org> wrote:
[SNIP]
> > diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
> > index 0f640e4871744262..8fad464a870a2b8e 100644
> > --- a/tools/perf/util/annotate.h
> > +++ b/tools/perf/util/annotate.h
> > @@ -199,8 +199,18 @@ struct annotation_write_ops {
> > void (*write_graph)(void *obj, int graph);
> > };
> >
> > +struct annotation_print_data {
> > + struct hist_entry *he;
> > + struct evsel *evsel;
> > + struct arch *arch;
> > + struct debuginfo *dbg;
> > + u64 start;
> > + int addr_fmt_width;
> > +};
>
> nit: As the scope of this is now global, is it worth commenting it?
> For example, where is start relative to?
Sure, I'll add comments.
>
> Reviewed-by: Ian Rogers <irogers@google.com>
Thanks,
Namhyung
© 2016 - 2025 Red Hat, Inc.