aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-report.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-02-04 13:43:24 -0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-02-05 12:28:48 -0200
commit2f525d0148ef2734c8a172201e5e1e9167a8a5fd (patch)
tree6bd0efbdeb640fa52616b20f03aed7176eb6c297 /tools/perf/builtin-report.c
parent78f7defedbb4da73b9a07635c357c1afcaa55c8f (diff)
downloadkernel_samsung_smdk4412-2f525d0148ef2734c8a172201e5e1e9167a8a5fd.zip
kernel_samsung_smdk4412-2f525d0148ef2734c8a172201e5e1e9167a8a5fd.tar.gz
kernel_samsung_smdk4412-2f525d0148ef2734c8a172201e5e1e9167a8a5fd.tar.bz2
perf annotate: Support multiple histograms in annotation
The perf annotate tool continues aggregating everything on just one histograms, but to support the top model add support for one histogram perf evsel in the evlist. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r--tools/perf/builtin-report.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 91e4cdb..de06bf5 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -118,8 +118,17 @@ static int perf_session__add_hist_entry(struct perf_session *session,
* so we don't allocated the extra space needed because the stdio
* code will not use it.
*/
- if (use_browser > 0)
- err = hist_entry__inc_addr_samples(he, al->addr);
+ if (al->sym != NULL && use_browser > 0) {
+ /*
+ * All aggregated on the first sym_hist.
+ */
+ struct annotation *notes = symbol__annotation(he->ms.sym);
+ if (notes->histograms == NULL &&
+ symbol__alloc_hist(he->ms.sym, 1) < 0)
+ err = -ENOMEM;
+ else
+ err = hist_entry__inc_addr_samples(he, 0, al->addr);
+ }
return err;
}
@@ -349,7 +358,7 @@ static int __cmd_report(void)
}
if (use_browser > 0)
- hists__tui_browse_tree(&session->hists_tree, help);
+ hists__tui_browse_tree(&session->hists_tree, help, 0);
else
hists__tty_browse_tree(&session->hists_tree, help);