summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-report.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-05-09 20:02:23 +0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-05-09 20:10:39 +0400
commit28e2a106d16046ca792722795f809e3f80a5af80 (patch)
treec84149ddf45d02044187fe4511cead93d009b6ee /tools/perf/builtin-report.c
parent39d1e1b1e26dc84d40bf2792287d0d61e44b57df (diff)
downloadlinux-28e2a106d16046ca792722795f809e3f80a5af80.tar.xz
perf hist: Simplify the insertion of new hist_entry instances
And with that fix at least one bug: The first hit for an entry, the one that calls malloc to create a new instance in __perf_session__add_hist_entry, wasn't adding the count to the per cpumode (PERF_RECORD_MISC_USER, etc) total variable. Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> 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.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 3a70c5807c04..5e2f47f88ec6 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -82,7 +82,6 @@ static int perf_session__add_hist_entry(struct perf_session *self,
{
struct map_symbol *syms = NULL;
struct symbol *parent = NULL;
- bool hit;
int err = -ENOMEM;
struct hist_entry *he;
struct event_stat_id *stats;
@@ -103,19 +102,12 @@ static int perf_session__add_hist_entry(struct perf_session *self,
if (stats == NULL)
goto out_free_syms;
he = __perf_session__add_hist_entry(&stats->hists, al, parent,
- data->period, &hit);
+ data->period);
if (he == NULL)
goto out_free_syms;
-
- if (hit)
- __perf_session__add_count(he, al, data->period);
-
err = 0;
- if (symbol_conf.use_callchain) {
- if (!hit)
- callchain_init(he->callchain);
+ if (symbol_conf.use_callchain)
err = append_chain(he->callchain, data->callchain, syms);
- }
out_free_syms:
free(syms);
return err;