Commit 2b8dbf69 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

perf annotate: Make sure to call symbol__annotate2() in TUI 



The symbol__annotate2() initializes some data structures needed by TUI.
It has a logic to prevent calling it multiple times by checking if it
has the annotated source.  But data type profiling uses a different
code (symbol__annotate) to allocate the annotated lines in advance.
So TUI missed to call symbol__annotate2() when it shows the annotation
browser.

Make symbol__annotate() reentrant and handle that situation properly.
This fixes a crash in the annotation browser started by perf report in
TUI like below.

  $ perf report -s type,sym --tui
  # and press 'a' key and then move down

Fixes: 81e57dee ("perf report: Support data type profiling")
Reviewed-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240405211800.1412920-2-namhyung@kernel.org
parent fec50db7

tools/perf/ui/browsers/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel, 
	if (dso->annotate_warned)

		return -1;



	if (not_annotated) {

	if (not_annotated || !sym->annotate2) {

		err = symbol__annotate2(ms, evsel, &browser.arch);

		if (err) {

			char msg[BUFSIZ];

tools/perf/util/annotate.c

+3 −0
Original line number Diff line number Diff line
@@ -2461,6 +2461,9 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel, 
	if (parch)

		*parch = arch;



	if (!list_empty(&notes->src->source))

		return 0;



	args.arch = arch;

	args.ms = *ms;

	if (annotate_opts.full_addr)