Commit f55c5552 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

perf report: Print sorted callchains per histogram entries

Use the newly created callchains radix tree to gather the chains stats
from the recorded events and then print the callchains for all of them,
sorted by hits, using the "-c" parameter with perf report.

Example:

 66.15%  [k] atm_clip_exit
            63.08%
                0xffffffffffffff80
                0xffffffff810196a8
                0xffffffff810c14c8
                0xffffffff8101a79c
                0xffffffff810194f3
                0xffffffff8106ab7f
                0xffffffff8106abe5
                0xffffffff8106acde
                0xffffffff8100d94b
                0xffffffff8153e7ea
                [...]

             1.54%
                0xffffffffffffff80
                0xffffffff810196a8
                0xffffffff810c14c8
                0xffffffff8101a79c
		[...]

Symbols are not yet resolved.
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1246026481-8314-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8cb76d99
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "util/rbtree.h" #include "util/rbtree.h"
#include "util/symbol.h" #include "util/symbol.h"
#include "util/string.h" #include "util/string.h"
#include "util/callchain.h"
#include "perf.h" #include "perf.h"
#include "util/header.h" #include "util/header.h"
...@@ -52,6 +53,7 @@ static char *parent_pattern = default_parent_pattern; ...@@ -52,6 +53,7 @@ static char *parent_pattern = default_parent_pattern;
static regex_t parent_regex; static regex_t parent_regex;
static int exclude_other = 1; static int exclude_other = 1;
static int callchain;
static u64 sample_type; static u64 sample_type;
...@@ -488,17 +490,19 @@ static size_t threads__fprintf(FILE *fp) ...@@ -488,17 +490,19 @@ static size_t threads__fprintf(FILE *fp)
static struct rb_root hist; static struct rb_root hist;
struct hist_entry { struct hist_entry {
struct rb_node rb_node; struct rb_node rb_node;
struct thread *thread; struct thread *thread;
struct map *map; struct map *map;
struct dso *dso; struct dso *dso;
struct symbol *sym; struct symbol *sym;
struct symbol *parent; struct symbol *parent;
u64 ip; u64 ip;
char level; char level;
struct callchain_node callchain;
u64 count; struct rb_root sorted_chain;
u64 count;
}; };
/* /*
...@@ -768,6 +772,48 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) ...@@ -768,6 +772,48 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
return cmp; return cmp;
} }
static size_t
callchain__fprintf(FILE *fp, struct callchain_node *self, u64 total_samples)
{
struct callchain_list *chain;
size_t ret = 0;
if (!self)
return 0;
ret += callchain__fprintf(fp, self->parent, total_samples);
list_for_each_entry(chain, &self->val, list)
ret += fprintf(fp, " %p\n", (void *)chain->ip);
return ret;
}
static size_t
hist_entry_callchain__fprintf(FILE *fp, struct hist_entry *self,
u64 total_samples)
{
struct rb_node *rb_node;
struct callchain_node *chain;
size_t ret = 0;
rb_node = rb_first(&self->sorted_chain);
while (rb_node) {
double percent;
chain = rb_entry(rb_node, struct callchain_node, rb_node);
percent = chain->hit * 100.0 / total_samples;
ret += fprintf(fp, " %6.2f%%\n", percent);
ret += callchain__fprintf(fp, chain, total_samples);
ret += fprintf(fp, "\n");
rb_node = rb_next(rb_node);
}
return ret;
}
static size_t static size_t
hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples) hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)
{ {
...@@ -808,6 +854,9 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples) ...@@ -808,6 +854,9 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)
ret += fprintf(fp, "\n"); ret += fprintf(fp, "\n");
if (callchain)
hist_entry_callchain__fprintf(fp, self, total_samples);
return ret; return ret;
} }
...@@ -892,6 +941,7 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, ...@@ -892,6 +941,7 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
.level = level, .level = level,
.count = count, .count = count,
.parent = NULL, .parent = NULL,
.sorted_chain = RB_ROOT
}; };
int cmp; int cmp;
...@@ -934,6 +984,8 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, ...@@ -934,6 +984,8 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
if (!cmp) { if (!cmp) {
he->count += count; he->count += count;
if (callchain)
append_chain(&he->callchain, chain);
return 0; return 0;
} }
...@@ -947,6 +999,10 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, ...@@ -947,6 +999,10 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
if (!he) if (!he)
return -ENOMEM; return -ENOMEM;
*he = entry; *he = entry;
if (callchain) {
callchain_init(&he->callchain);
append_chain(&he->callchain, chain);
}
rb_link_node(&he->rb_node, parent, p); rb_link_node(&he->rb_node, parent, p);
rb_insert_color(&he->rb_node, &hist); rb_insert_color(&he->rb_node, &hist);
...@@ -1023,6 +1079,9 @@ static void output__insert_entry(struct hist_entry *he) ...@@ -1023,6 +1079,9 @@ static void output__insert_entry(struct hist_entry *he)
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
struct hist_entry *iter; struct hist_entry *iter;
if (callchain)
sort_chain_to_rbtree(&he->sorted_chain, &he->callchain);
while (*p != NULL) { while (*p != NULL) {
parent = *p; parent = *p;
iter = rb_entry(parent, struct hist_entry, rb_node); iter = rb_entry(parent, struct hist_entry, rb_node);
...@@ -1599,6 +1658,7 @@ static const struct option options[] = { ...@@ -1599,6 +1658,7 @@ static const struct option options[] = {
"regex filter to identify parent, see: '--sort parent'"), "regex filter to identify parent, see: '--sort parent'"),
OPT_BOOLEAN('x', "exclude-other", &exclude_other, OPT_BOOLEAN('x', "exclude-other", &exclude_other,
"Only display entries with parent-match"), "Only display entries with parent-match"),
OPT_BOOLEAN('c', "callchain", &callchain, "Display callchains"),
OPT_END() OPT_END()
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment