diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-04-15 14:24:39 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-04-16 11:09:59 -0400 |
commit | 29ed6e76b4ca81103f31c8316f9e4cfcf134572f (patch) | |
tree | 899c3a3262d5f84ecdb7e45d2f21f33c8dea827e /tools/perf/util/annotate.h | |
parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) |
perf annotate: Rename objdump_line to disasm_line
We want to move away from using 'objdump -dS' as the only disassembler
supported.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-lsn9pjuxxm5ezsubyhkmprw7@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.h')
-rw-r--r-- | tools/perf/util/annotate.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index efa5dc82bfae..8bb68bb2a04a 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h | |||
@@ -7,15 +7,14 @@ | |||
7 | #include <linux/list.h> | 7 | #include <linux/list.h> |
8 | #include <linux/rbtree.h> | 8 | #include <linux/rbtree.h> |
9 | 9 | ||
10 | struct objdump_line { | 10 | struct disasm_line { |
11 | struct list_head node; | 11 | struct list_head node; |
12 | s64 offset; | 12 | s64 offset; |
13 | char *line; | 13 | char *line; |
14 | }; | 14 | }; |
15 | 15 | ||
16 | void objdump_line__free(struct objdump_line *self); | 16 | void disasm_line__free(struct disasm_line *dl); |
17 | struct objdump_line *objdump__get_next_ip_line(struct list_head *head, | 17 | struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disasm_line *pos); |
18 | struct objdump_line *pos); | ||
19 | 18 | ||
20 | struct sym_hist { | 19 | struct sym_hist { |
21 | u64 sum; | 20 | u64 sum; |
@@ -32,7 +31,7 @@ struct source_line { | |||
32 | * | 31 | * |
33 | * @histogram: Array of addr hit histograms per event being monitored | 32 | * @histogram: Array of addr hit histograms per event being monitored |
34 | * @lines: If 'print_lines' is specified, per source code line percentages | 33 | * @lines: If 'print_lines' is specified, per source code line percentages |
35 | * @source: source parsed from objdump -dS | 34 | * @source: source parsed from a disassembler like objdump -dS |
36 | * | 35 | * |
37 | * lines is allocated, percentages calculated and all sorted by percentage | 36 | * lines is allocated, percentages calculated and all sorted by percentage |
38 | * when the annotation is about to be presented, so the percentages are for | 37 | * when the annotation is about to be presented, so the percentages are for |
@@ -82,7 +81,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx, | |||
82 | int context); | 81 | int context); |
83 | void symbol__annotate_zero_histogram(struct symbol *sym, int evidx); | 82 | void symbol__annotate_zero_histogram(struct symbol *sym, int evidx); |
84 | void symbol__annotate_decay_histogram(struct symbol *sym, int evidx); | 83 | void symbol__annotate_decay_histogram(struct symbol *sym, int evidx); |
85 | void objdump_line_list__purge(struct list_head *head); | 84 | void disasm__purge(struct list_head *head); |
86 | 85 | ||
87 | int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx, | 86 | int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx, |
88 | bool print_lines, bool full_paths, int min_pcnt, | 87 | bool print_lines, bool full_paths, int min_pcnt, |