From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
Jin Yao <yao.jin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 36/44] perf annotate browser: Add 'P' hotkey to dump annotation to file
Date: Sat, 24 Mar 2018 17:02:03 -0300 [thread overview]
Message-ID: <20180324200211.21326-37-acme@kernel.org> (raw)
In-Reply-To: <20180324200211.21326-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Just like we have in the histograms browser used as the main screen for
'perf top --tui' and 'perf report --tui', to print the current
annotation to a file with a named composed by the symbol name and the
".annotation" suffix.
Here is one example of pressing 'A' on 'perf top' to live annotate a
kernel function and then press 'P' to dump that annotation, the
resulting file:
# cat _raw_spin_lock_irqsave.annotation
_raw_spin_lock_irqsave() /proc/kcore
Event: cycles:ppp
7.14 nop
21.43 push %rbx
7.14 pushfq
pop %rax
nop
mov %rax,%rbx
cli
nop
xor %eax,%eax
mov $0x1,%edx
64.29 lock cmpxchg %edx,(%rdi)
test %eax,%eax
↓ jne 2b
mov %rbx,%rax
pop %rbx
← retq
2b: mov %eax,%esi
→ callq queued_spin_lock_slowpath
mov %rbx,%rax
pop %rbx
← retq
#
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-zzmnrwugb5vtk7bvg0rbx150@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 4 ++++
tools/perf/util/annotate.c | 31 +++++++++++++++++++++++++++++++
tools/perf/util/annotate.h | 2 ++
3 files changed, 37 insertions(+)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 916f237c1df8..3834b264ba41 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -661,6 +661,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
"t Circulate percent, total period, samples view\n"
"/ Search string\n"
"k Toggle line numbers\n"
+ "P Print to [symbol_name].annotation file.\n"
"r Run available scripts\n"
"? Search string backwards\n");
continue;
@@ -737,6 +738,9 @@ static int annotate_browser__run(struct annotate_browser *browser,
}
continue;
}
+ case 'P':
+ map_symbol__annotation_dump(ms, evsel);
+ continue;
case 't':
if (notes->options->show_total_period) {
notes->options->show_total_period = false;
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7a6a85f9fea6..a7111871440e 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2037,6 +2037,37 @@ int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
return 0;
}
+int map_symbol__annotation_dump(struct map_symbol *ms, struct perf_evsel *evsel)
+{
+ const char *ev_name = perf_evsel__name(evsel);
+ char buf[1024];
+ char *filename;
+ int err = -1;
+ FILE *fp;
+
+ if (asprintf(&filename, "%s.annotation", ms->sym->name) < 0)
+ return -1;
+
+ fp = fopen(filename, "w");
+ if (fp == NULL)
+ goto out_free_filename;
+
+ if (perf_evsel__is_group_event(evsel)) {
+ perf_evsel__group_desc(evsel, buf, sizeof(buf));
+ ev_name = buf;
+ }
+
+ fprintf(fp, "%s() %s\nEvent: %s\n\n",
+ ms->sym->name, ms->map->dso->long_name, ev_name);
+ symbol__annotate_fprintf2(ms->sym, fp);
+
+ fclose(fp);
+ err = 0;
+out_free_filename:
+ free(filename);
+ return err;
+}
+
void symbol__annotate_zero_histogram(struct symbol *sym, int evidx)
{
struct annotation *notes = symbol__annotation(sym);
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 3faa58045b22..365e9df888cf 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -288,6 +288,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);
void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);
void annotated_source__purge(struct annotated_source *as);
+int map_symbol__annotation_dump(struct map_symbol *ms, struct perf_evsel *evsel);
+
bool ui__has_annotation(void);
int symbol__tty_annotate(struct symbol *sym, struct map *map,
--
2.14.3
next prev parent reply other threads:[~2018-03-24 20:02 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 20:01 [GIT PULL 00/44] perf/core improvements and fixes Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 01/44] perf unwind: Report error from dwfl_attach_state Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 02/44] perf annotate: Move annotation_options out of the TUI browser Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 03/44] perf annotate: Move cycles/IPC formatting width constants outside TUI Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 04/44] perf annotate tui: Use annotate_browser__cycles_width() mroe Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 05/44] perf annotate tui: Move have_cycles to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 06/44] perf annotate: Move annotation_line array from TUI to generic code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 07/44] perf annotate: Move compute_ipc() to annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 08/44] perf annotate: Move nr_events from annotate_browser to annotation struct Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 09/44] perf annotate: Stop using a global config struct Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 10/44] perf annotate: Move pcnt_with() to the annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 11/44] perf annotate tui: Add browser__annotation() helper Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 12/44] perf annotate: Move max_jump_sources to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 13/44] perf annotate: Move jumps_percent_color to ui_browser Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 14/44] perf annotate: Move nr_jumps to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 15/44] perf annotate: Move mark_jump_targets from the TUI to the annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 16/44] perf annotate: Nuke struct browser_line Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 17/44] perf annotate: Move 'start' to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 18/44] perf annotate: Move nr_{asm_}entries " Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 19/44] perf annotate: Introduce set_offsets() method out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 20/44] perf annotate: Move the column widths from the TUI to generic lib Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 21/44] perf annotate: Move update_column_widths() to the " Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 22/44] perf annotate: Introduce init_column_widths() method out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 23/44] perf annotate: Introduce symbol__annotate2 method Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 24/44] perf annotate: Introduce annotation_line__max_percent() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 25/44] perf ui browser: Add vprintf() method Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 26/44] perf annotate: Introduce annotation_line__print_start() out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 27/44] perf annotate: Finish the generalization of annotate_browser__write() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 28/44] perf annotate: Use a ops table for annotation_line__write() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 29/44] perf annotate: Introduce annotation_line__filter() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 30/44] perf annotate: Introduce the --stdio2 output mode Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 31/44] perf annotate: Move the default annotate options to the library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 32/44] perf annotate: Use the default annotation options for --stdio2 Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 33/44] perf annotate: Add function header to --stdio2 Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 34/44] perf annotate: Introduce --ignore-vmlinux command line option Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 35/44] perf report: " Arnaldo Carvalho de Melo
2018-03-24 20:02 ` Arnaldo Carvalho de Melo [this message]
2018-03-24 20:02 ` [PATCH 37/44] perf annotate: No need to calculate notes->start twice Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 38/44] perf annotate: Pass function descriptor to its instruction parsing routines Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 39/44] perf annotate: Mark jumps to outher functions with the call arrow Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 40/44] perf python: Reference Py_None before returning it Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 41/44] perf annotate: Add "_local" to jump/offset validation routines Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 42/44] perf annotate: Support jumping from one function to another Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 43/44] perf annotate: Defer searching for comma in raw line till it is needed Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 44/44] perf annotate: Use absolute addresses to calculate jump target offsets Arnaldo Carvalho de Melo
2018-03-25 8:40 ` [GIT PULL 00/44] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180324200211.21326-37-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).