aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2018-03-15 16:54:11 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-03-20 13:19:30 -0300
commitecda45bd6cfe0badda0e8215c5a008eaf7647716 (patch)
treebb05411b2b6a4d048f28015394a81ecdd2cb42c4 /tools/perf
parentperf annotate: Introduce init_column_widths() method out of TUI code (diff)
downloadwireguard-linux-ecda45bd6cfe0badda0e8215c5a008eaf7647716.tar.xz
wireguard-linux-ecda45bd6cfe0badda0e8215c5a008eaf7647716.zip
perf annotate: Introduce symbol__annotate2 method
That does all the extended boilerplate the TUI browser did, leaving the symbol__annotate() function to be used by the old --stdio output mode. Now the upcoming --stdio2 output mode should just use this one to set things up. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: https://lkml.kernel.org/n/tip-e2x8wuf6gvdhzdryo229vj4i@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/ui/browsers/annotate.c28
-rw-r--r--tools/perf/util/annotate.c39
-rw-r--r--tools/perf/util/annotate.h4
3 files changed, 44 insertions, 27 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 06ad5ecaa67a..ab21739f27ae 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -910,7 +910,6 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
struct hist_browser_timer *hbt)
{
struct annotation *notes = symbol__annotation(sym);
- size_t size;
struct map_symbol ms = {
.map = map,
.sym = sym,
@@ -926,28 +925,14 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
},
};
int ret = -1, err;
- int nr_pcnt = 1;
if (sym == NULL)
return -1;
- size = symbol__size(sym);
-
if (map->dso->annotate_warned)
return -1;
- notes->options = &annotate_browser__opts;
-
- notes->offsets = zalloc(size * sizeof(struct annotation_line *));
- if (notes->offsets == NULL) {
- ui__error("Not enough memory!");
- return -1;
- }
-
- if (perf_evsel__is_group_event(evsel))
- nr_pcnt = evsel->nr_members;
-
- err = symbol__annotate(sym, map, evsel, 0, &browser.arch);
+ err = symbol__annotate2(sym, map, evsel, &annotate_browser__opts, &browser.arch);
if (err) {
char msg[BUFSIZ];
symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));
@@ -955,18 +940,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
goto out_free_offsets;
}
- symbol__calc_percent(sym, evsel);
-
ui_helpline__push("Press ESC to exit");
- notes->start = map__rip_2objdump(map, sym->start);
-
- annotation__set_offsets(notes, size);
browser.b.width = notes->max_line_len;
- annotation__mark_jump_targets(notes, sym);
- annotation__compute_ipc(notes, size);
- annotation__init_column_widths(notes, sym);
- notes->nr_events = nr_pcnt;
browser.b.nr_entries = notes->nr_entries;
browser.b.entries = &notes->src->source,
browser.b.width += 18; /* Percentage */
@@ -974,8 +950,6 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
if (notes->options->hide_src_code)
ui_browser__init_asm_mode(&browser.b);
- annotation__update_column_widths(notes);
-
ret = annotate_browser__run(&browser, evsel, hbt);
annotated_source__purge(notes->src);
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 9c05b534f428..7ad6400a0d4f 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2183,3 +2183,42 @@ bool ui__has_annotation(void)
{
return use_browser == 1 && perf_hpp_list.sym;
}
+
+int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evsel,
+ struct annotation_options *options, struct arch **parch)
+{
+ struct annotation *notes = symbol__annotation(sym);
+ size_t size = symbol__size(sym);
+ int nr_pcnt = 1, err;
+
+ notes->offsets = zalloc(size * sizeof(struct annotation_line *));
+ if (notes->offsets == NULL)
+ return -1;
+
+ if (perf_evsel__is_group_event(evsel))
+ nr_pcnt = evsel->nr_members;
+
+ err = symbol__annotate(sym, map, evsel, 0, parch);
+ if (err)
+ goto out_free_offsets;
+
+ notes->options = options;
+
+ symbol__calc_percent(sym, evsel);
+
+ notes->start = map__rip_2objdump(map, sym->start);
+
+ annotation__set_offsets(notes, size);
+ annotation__mark_jump_targets(notes, sym);
+ annotation__compute_ipc(notes, size);
+ annotation__init_column_widths(notes, sym);
+ notes->nr_events = nr_pcnt;
+
+ annotation__update_column_widths(notes);
+
+ return 0;
+
+out_free_offsets:
+ zfree(&notes->offsets);
+ return -1;
+}
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index c4528e03a031..f93c805473f9 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -233,6 +233,10 @@ void symbol__annotate_zero_histograms(struct symbol *sym);
int symbol__annotate(struct symbol *sym, struct map *map,
struct perf_evsel *evsel, size_t privsize,
struct arch **parch);
+int symbol__annotate2(struct symbol *sym, struct map *map,
+ struct perf_evsel *evsel,
+ struct annotation_options *options,
+ struct arch **parch);
enum symbol_disassemble_errno {
SYMBOL_ANNOTATE_ERRNO__SUCCESS = 0,