diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-07-29 15:44:56 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-08-01 16:06:46 -0400 |
commit | 5cb725a9723aebb248106ff7f8c6c7253b24bbb1 (patch) | |
tree | 0196bf479c598964a6466cd5efed2e8744645094 /tools/perf/ui | |
parent | ce92834407a465c25c0be1a4a0339c625e44c4db (diff) |
perf annotate: Rename symbol__annotate() to symbol__disassemble()
This function will not annotate anything, it will just disassembly the
given map->dso and symbol.
It currently does this by parsing the output of 'objdump --disassemble',
but this could conceivably be done using a library or an offshot of
the kernel's instruction decoder (arch/x86/lib/inat.c), etc.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2xpfl4bfnrd6x584b390qok7@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/ui')
-rw-r--r-- | tools/perf/ui/browsers/annotate.c | 2 | ||||
-rw-r--r-- | tools/perf/ui/gtk/annotate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 29dc6d20364e..f4d6a8a962af 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c | |||
@@ -1050,7 +1050,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, | |||
1050 | (nr_pcnt - 1); | 1050 | (nr_pcnt - 1); |
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | if (symbol__annotate(sym, map, sizeof_bdl) < 0) { | 1053 | if (symbol__disassemble(sym, map, sizeof_bdl) < 0) { |
1054 | ui__error("%s", ui_helpline__last_msg); | 1054 | ui__error("%s", ui_helpline__last_msg); |
1055 | goto out_free_offsets; | 1055 | goto out_free_offsets; |
1056 | } | 1056 | } |
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c index 9c7ff8d31b27..35e4b9e28c8d 100644 --- a/tools/perf/ui/gtk/annotate.c +++ b/tools/perf/ui/gtk/annotate.c | |||
@@ -166,7 +166,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map, | |||
166 | if (map->dso->annotate_warned) | 166 | if (map->dso->annotate_warned) |
167 | return -1; | 167 | return -1; |
168 | 168 | ||
169 | if (symbol__annotate(sym, map, 0) < 0) { | 169 | if (symbol__disassemble(sym, map, 0) < 0) { |
170 | ui__error("%s", ui_helpline__current); | 170 | ui__error("%s", ui_helpline__current); |
171 | return -1; | 171 | return -1; |
172 | } | 172 | } |