From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754019AbbGANJx (ORCPT ); Wed, 1 Jul 2015 09:09:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44296 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753510AbbGANJp (ORCPT ); Wed, 1 Jul 2015 09:09:45 -0400 Date: Wed, 1 Jul 2015 15:09:42 +0200 From: Jiri Olsa To: Taeung Song Cc: Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org, namhyung@kernel.org, Ingo Molnar Subject: Re: [PATCH v3 4/5] perf mem: Fill in the missing freeing a session after an error occur Message-ID: <20150701130942.GA14695@krava.brq.redhat.com> References: <1435751988-9886-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: <1435751988-9886-1-git-send-email-treeze.taeung@gmail.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 On Wed, Jul 01, 2015 at 08:59:48PM +0900, Taeung Song wrote: > When an error occur a error value is just 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 Song > --- > commit_msg | 5 +++++ > tools/perf/builtin-mem.c | 16 ++++++---------- > 2 files changed, 11 insertions(+), 10 deletions(-) > create mode 100644 commit_msg > > diff --git a/commit_msg b/commit_msg > new file mode 100644 > index 0000000..659c93f > --- /dev/null > +++ b/commit_msg > @@ -0,0 +1,5 @@ > +perf kmem: Fill in the missing freeing a session after an error occur > + > +When an error occur a error value is just returned > +without freeing the session. So allocating and freeing > +session have to be matched as a pair even if an error occur. extra file added ^^^, apart from that: Acked-by: Jiri Olsa thanks, jirka > diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c > index da2ec06..80170aa 100644 > --- a/tools/perf/builtin-mem.c > +++ b/tools/perf/builtin-mem.c > @@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem) > .mode = PERF_DATA_MODE_READ, > .force = mem->force, > }; > - int err = -EINVAL; > int ret; > struct perf_session *session = perf_session__new(&file, false, > &mem->tool); > @@ -135,24 +134,21 @@ 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 < 0) > goto out_delete; > } > > - 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 = perf_session__process_events(session); > > out_delete: > perf_session__delete(session); > - return err; > + return ret; > } > > static int report_events(int argc, const char **argv, struct perf_mem *mem) > -- > 1.9.1 >