perf annotate-data: Check annotation on perf report TUI
Namhyung Kim
maintainerPATCH 1/1 perf annotate-data: Check annotation on perf report TUI
As it removed the sample accounting for code when no symbol sort key is given for perf report TUI, it might not allocate the annotated_source yet. Let's check if it's NULL first.
--- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/annotate.c +1 -1
@@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,if (parch) *parch = arch; -if (!list_empty (¬es->src->source)) +if (notes->src && !list_empty (¬es->src->source))return 0 ; args.arch = arch;
Signature · 1 line
2.44.0.769.g3c40516874-goog
Quoted 7 lines · Namhyung Kim
As it removed the sample accounting for code when no symbol sort key is given for perf report TUI, it might not allocate the
annotated_sourceyet. Let's check if it's NULL first.Fixes 6cdd977ec24e1 ("perf report: Do not collect sample histogram unnecessarily")Signed-off-by Namhyung Kim <[email protected]>
Thanks,
Ian
Quoted 21 lines
--- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/annotate.c +1
-2@@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,if (parch) *parch = arch; -if (!list_empty (¬es->src->source)) +if (notes->src && !list_empty (¬es->src->source))return 0 ; args.arch = arch; --2.44.0.769.g3c40516874-goog
Quoted 6 lines · Namhyung Kim
As it removed the sample accounting for code when no symbol sort key is given for perf report TUI, it might not allocate the
annotated_sourceyet. Let's check if it's NULL first.Fixes 6cdd977ec24e1 ("perf report: Do not collect sample histogram unnecessarily")Signed-off-by Namhyung Kim <[email protected]>
Picking it up into perf-tools-next:
⬢[acme@toolbox perf-tools-next]$ git log torvalds/master.. perf-tools-next | grep 6cdd977ec24e1 commit 6cdd977ec24e1538b35a08bde823a74b69e829f2
⬢[acme@toolbox perf-tools-next]$
- Arnaldo
Quoted 19 lines
--- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/annotate.c +1
-1@@ -906,7 +906,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,if (parch) *parch = arch; -if (!list_empty (¬es->src->source)) +if (notes->src && !list_empty (¬es->src->source))return 0 ; args.arch = arch;Signature · 1 line
2.44.0.769.g3c40516874-goog