diff options
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 0955cff5b0ef..f080cc40f00b 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -649,9 +649,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st | |||
649 | 649 | ||
650 | next = disasm__get_next_ip_line(¬es->src->source, dl); | 650 | next = disasm__get_next_ip_line(¬es->src->source, dl); |
651 | 651 | ||
652 | if (symbol_conf.event_group && | 652 | if (perf_evsel__is_group_event(evsel)) { |
653 | perf_evsel__is_group_leader(evsel) && | ||
654 | evsel->nr_members > 1) { | ||
655 | nr_percent = evsel->nr_members; | 653 | nr_percent = evsel->nr_members; |
656 | ppercents = calloc(nr_percent, sizeof(double)); | 654 | ppercents = calloc(nr_percent, sizeof(double)); |
657 | if (ppercents == NULL) | 655 | if (ppercents == NULL) |
@@ -721,8 +719,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st | |||
721 | if (queue) | 719 | if (queue) |
722 | return -1; | 720 | return -1; |
723 | 721 | ||
724 | if (symbol_conf.event_group && | 722 | if (perf_evsel__is_group_event(evsel)) |
725 | perf_evsel__is_group_leader(evsel)) | ||
726 | width *= evsel->nr_members; | 723 | width *= evsel->nr_members; |
727 | 724 | ||
728 | if (!*dl->line) | 725 | if (!*dl->line) |
@@ -1126,7 +1123,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, | |||
1126 | len = symbol__size(sym); | 1123 | len = symbol__size(sym); |
1127 | namelen = strlen(d_filename); | 1124 | namelen = strlen(d_filename); |
1128 | 1125 | ||
1129 | if (symbol_conf.event_group && perf_evsel__is_group_leader(evsel)) | 1126 | if (perf_evsel__is_group_event(evsel)) |
1130 | width *= evsel->nr_members; | 1127 | width *= evsel->nr_members; |
1131 | 1128 | ||
1132 | printf(" %-*.*s| Source code & Disassembly of %s\n", | 1129 | printf(" %-*.*s| Source code & Disassembly of %s\n", |