perf kmem: Resolve symbols
E.g.:
[root@doppio linux-2.6-tip]# perf kmem record sleep 3s
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.804 MB perf.data (~35105 samples) ]
[root@doppio linux-2.6-tip]# perf kmem --stat caller | head -10
------------------------------------------------------------------------------
Callsite |Total_alloc/Per | Total_req/Per | Hit | Frag
------------------------------------------------------------------------------
getname/40 | 1519616/4096 | 1519616/4096 | 371| 0.000%
seq_read/a2 | 987136/4096 | 987136/4096 | 241| 0.000%
__netdev_alloc_skb/43 | 260368/1049 | 259968/1048 | 248| 0.154%
__alloc_skb/5a | 77312/256 | 77312/256 | 302| 0.000%
proc_alloc_inode/33 | 76480/632 | 76472/632 | 121| 0.010%
get_empty_filp/8d | 70272/192 | 70272/192 | 366| 0.000%
split_vma/8e | 42064/176 | 42064/176 | 239| 0.000%
[root@doppio linux-2.6-tip]#
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: linux-mm@kvack.org <linux-mm@kvack.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1259005869-13487-2-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 5d8aeae..256d18f 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -307,25 +307,34 @@
{
struct rb_node *next;
- printf("\n ------------------------------------------------------------------------------\n");
- if (is_caller)
- printf(" Callsite |");
- else
- printf(" Alloc Ptr |");
- printf(" Total_alloc/Per | Total_req/Per | Hit | Fragmentation\n");
- printf(" ------------------------------------------------------------------------------\n");
+ printf("%.78s\n", graph_dotted_line);
+ printf("%-28s|", is_caller ? "Callsite": "Alloc Ptr");
+ printf("Total_alloc/Per | Total_req/Per | Hit | Frag\n");
+ printf("%.78s\n", graph_dotted_line);
next = rb_first(root);
while (next && n_lines--) {
- struct alloc_stat *data;
+ struct alloc_stat *data = rb_entry(next, struct alloc_stat,
+ node);
+ struct symbol *sym = NULL;
+ char bf[BUFSIZ];
+ u64 addr;
- data = rb_entry(next, struct alloc_stat, node);
+ if (is_caller) {
+ addr = data->call_site;
+ sym = kernel_maps__find_symbol(addr, NULL, NULL);
+ } else
+ addr = data->ptr;
- printf(" %-16p | %8llu/%-6lu | %8llu/%-6lu | %6lu | %8.3f%%\n",
- is_caller ? (void *)(unsigned long)data->call_site :
- (void *)(unsigned long)data->ptr,
- (unsigned long long)data->bytes_alloc,
+ if (sym != NULL)
+ snprintf(bf, sizeof(bf), "%s/%Lx", sym->name,
+ addr - sym->start);
+ else
+ snprintf(bf, sizeof(bf), "%#Lx", addr);
+
+ printf("%-28s|%8llu/%-6lu |%8llu/%-6lu|%6lu|%8.3f%%\n",
+ bf, (unsigned long long)data->bytes_alloc,
(unsigned long)data->bytes_alloc / data->hit,
(unsigned long long)data->bytes_req,
(unsigned long)data->bytes_req / data->hit,