From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753112AbbF2NJM (ORCPT ); Mon, 29 Jun 2015 09:09:12 -0400 Received: from mail.kernel.org ([198.145.29.136]:46795 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753080AbbF2NJG (ORCPT ); Mon, 29 Jun 2015 09:09:06 -0400 Date: Mon, 29 Jun 2015 10:09:02 -0300 From: Arnaldo Carvalho de Melo To: taeung Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com, namhyung@kernel.org, Ingo Molnar Subject: Re: [PATCH] perf session: Fill in the missing freeing a session after an error occur Message-ID: <20150629130902.GB11747@kernel.org> References: <1435414132-6296-1-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435414132-6296-1-git-send-email-treeze.taeung@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sat, Jun 27, 2015 at 11:08:52PM +0900, taeung escreveu: > In some cases some sessions aren't freed. > For example, a session is allocated and then > if an error occur, just a error value is returned > without freeing the session. So allocating and freeing > session have to be matched as a pair even if an error occur. > > Signed-off-by: taeung > --- > tools/perf/builtin-inject.c | 7 ++++--- > tools/perf/builtin-kmem.c | 4 ++-- > tools/perf/builtin-kvm.c | 16 ++++++++++++---- > tools/perf/builtin-mem.c | 17 ++++++++++------- > tools/perf/builtin-report.c | 6 ++++-- > 5 files changed, 32 insertions(+), 18 deletions(-) > +++ b/tools/perf/builtin-mem.c > @@ -135,24 +135,27 @@ static int report_raw_events(struct perf_mem *mem) > if (mem->cpu_list) { > ret = perf_session__cpu_bitmap(session, mem->cpu_list, > mem->cpu_bitmap); > - if (ret) > + if (ret) { > + ret = err; > goto out_delete; How come? Can you break this into per-tool patches? If that would be the case I would have applied some now. - Arnaldo > + } > } > > - if (symbol__init(&session->header.env) < 0) > - return -1; > + ret = symbol__init(&session->header.env); > + if (ret < 0) > + goto out_delete; > > printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n"); > > err = perf_session__process_events(session); > if (err) > - return err; > - > - return 0; > + ret = err; > + else > + ret = 0; > > out_delete: > perf_session__delete(session); > - return err; > + return ret; > } > > static int report_events(int argc, const char **argv, struct perf_mem *mem) > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c > index 32626ea..610d056 100644 > --- a/tools/perf/builtin-report.c > +++ b/tools/perf/builtin-report.c > @@ -828,8 +828,10 @@ repeat: > if (report.header || report.header_only) { > perf_session__fprintf_info(session, stdout, > report.show_full_info); > - if (report.header_only) > - return 0; > + if (report.header_only) { > + ret = 0; > + goto error; > + } > } else if (use_browser == 0) { > fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n", > stdout); > -- > 1.9.1