aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/annotate.c
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2018-08-04 09:05:19 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-08-08 14:55:53 -0400
commit4c04868fbe931ec315ad34bb7e28e5cf725f88e4 (patch)
tree3013cc9e8df554543a77bb8db00a559644ec6585 /tools/perf/util/annotate.c
parentaddba8b66f9101b0e55a151fc543ff35990bc8ef (diff)
perf annotate: Display percent type in stdio output
In following patches we will allow to switch percent type even for stdio annotation outputs. Adding the percent type value into the annotation outputs title. $ perf annotate --stdio Percent | Sou ... instructions:u } (2805 samples, percent: local period) --------------------------- ... ------------------------------------------------------ ... $ perf annotate --stdio2 Samples: 2K of events 'anon ... count (approx.): 156525487, [percent: local period] safe_write.c() /usr/bin/yes Percent ... Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/20180804130521.11408-19-jolsa@kernel.org 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.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 05d15629afd0..6316fa96d984 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2056,10 +2056,12 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
2056 evsel_name = buf; 2056 evsel_name = buf;
2057 } 2057 }
2058 2058
2059 graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", 2059 graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples, "
2060 "percent: %s)\n",
2060 width, width, symbol_conf.show_total_period ? "Period" : 2061 width, width, symbol_conf.show_total_period ? "Period" :
2061 symbol_conf.show_nr_samples ? "Samples" : "Percent", 2062 symbol_conf.show_nr_samples ? "Samples" : "Percent",
2062 d_filename, evsel_name, h->nr_samples); 2063 d_filename, evsel_name, h->nr_samples,
2064 percent_type_str(opts->percent_type));
2063 2065
2064 printf("%-*.*s----\n", 2066 printf("%-*.*s----\n",
2065 graph_dotted_len, graph_dotted_len, graph_dotted_line); 2067 graph_dotted_len, graph_dotted_len, graph_dotted_line);
@@ -2434,7 +2436,8 @@ int symbol__tty_annotate2(struct symbol *sym, struct map *map,
2434 } 2436 }
2435 2437
2436 hists__scnprintf_title(hists, buf, sizeof(buf)); 2438 hists__scnprintf_title(hists, buf, sizeof(buf));
2437 fprintf(stdout, "%s\n%s() %s\n", buf, sym->name, dso->long_name); 2439 fprintf(stdout, "%s, [percent: %s]\n%s() %s\n",
2440 buf, percent_type_str(opts->percent_type), sym->name, dso->long_name);
2438 symbol__annotate_fprintf2(sym, stdout, opts); 2441 symbol__annotate_fprintf2(sym, stdout, opts);
2439 2442
2440 annotated_source__purge(symbol__annotation(sym)->src); 2443 annotated_source__purge(symbol__annotation(sym)->src);