diff options
author | Taeung Song <treeze.taeung@gmail.com> | 2017-08-18 04:46:48 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-08-18 09:31:53 -0400 |
commit | 1ac39372e06f5009982aaaf890fc5bbd044bb047 (patch) | |
tree | 38059befa819af8d01667ef4733a41f117ab91ca /tools/perf/util/annotate.c | |
parent | 9a57eaf1d2443d34cce0562f425228c37a8ec019 (diff) |
perf annotate stdio: Support --show-nr-samples option
Add --show-nr-samples option to "perf annotate" so that it matches "perf
report".
Committer note:
Note that it can't be used together with --show-total-period, which
seems like a silly limitation, that can be lifted at some point.
Made it bail out if not on --stdio.
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1503046008-5511-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 2dab0e5a7f2f..4397a8b6e6cd 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -1145,6 +1145,9 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st | |||
1145 | if (symbol_conf.show_total_period) | 1145 | if (symbol_conf.show_total_period) |
1146 | color_fprintf(stdout, color, " %11" PRIu64, | 1146 | color_fprintf(stdout, color, " %11" PRIu64, |
1147 | sample.period); | 1147 | sample.period); |
1148 | else if (symbol_conf.show_nr_samples) | ||
1149 | color_fprintf(stdout, color, " %7" PRIu64, | ||
1150 | sample.nr_samples); | ||
1148 | else | 1151 | else |
1149 | color_fprintf(stdout, color, " %7.2f", percent); | 1152 | color_fprintf(stdout, color, " %7.2f", percent); |
1150 | } | 1153 | } |
@@ -1825,7 +1828,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, | |||
1825 | width *= evsel->nr_members; | 1828 | width *= evsel->nr_members; |
1826 | 1829 | ||
1827 | graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", | 1830 | graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", |
1828 | width, width, symbol_conf.show_total_period ? "Event count" : "Percent", | 1831 | width, width, symbol_conf.show_total_period ? "Period" : |
1832 | symbol_conf.show_nr_samples ? "Samples" : "Percent", | ||
1829 | d_filename, evsel_name, h->nr_samples); | 1833 | d_filename, evsel_name, h->nr_samples); |
1830 | 1834 | ||
1831 | printf("%-*.*s----\n", | 1835 | printf("%-*.*s----\n", |