Prev: [PATCH 0/3] perf tools minor fixes
Next: [PATCH] Add Lenovo Thinkpad T400 to the whitelist
From: Arnaldo Carvalho de Melo on 9 May 2010 12:20
From: Arnaldo Carvalho de Melo <acme(a)redhat.com>

Cc: Frédéric Weisbecker <fweisbec(a)gmail.com>
Cc: Mike Galbraith <efault(a)gmx.de>
Cc: Paul Mackerras <paulus(a)samba.org>
Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
Cc: Tom Zanussi <tzanussi(a)gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
---
tools/perf/builtin-report.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1cae877..3a70c58 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -83,7 +83,7 @@ static int perf_session__add_hist_entry(struct perf_session *self,
struct map_symbol *syms = NULL;
struct symbol *parent = NULL;
bool hit;
- int err;
+ int err = -ENOMEM;
struct hist_entry *he;
struct event_stat_id *stats;
struct perf_event_attr *attr;
@@ -101,26 +101,24 @@ static int perf_session__add_hist_entry(struct perf_session *self,
else
stats = get_stats(self, data->id, 0, 0);
if (stats == NULL)
- return -ENOMEM;
+ goto out_free_syms;
he = __perf_session__add_hist_entry(&stats->hists, al, parent,
data->period, &hit);
if (he == NULL)
- return -ENOMEM;
+ 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);
err = append_chain(he->callchain, data->callchain, syms);
- free(syms);
-
- if (err)
- return err;
}
-
- return 0;
+out_free_syms:
+ free(syms);
+ return err;
}

static int add_event_total(struct perf_session *session,
--
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 0/3] perf tools minor fixes
Next: [PATCH] Add Lenovo Thinkpad T400 to the whitelist