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>
This commit is contained in:
Arnaldo Carvalho de Melo
2010-05-09 13:02:23 -03:00
parent 39d1e1b1e2
commit 28e2a106d1
5 changed files with 32 additions and 44 deletions

View File

@@ -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;