From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752865AbbF3LSA (ORCPT ); Tue, 30 Jun 2015 07:18:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47132 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752935AbbF3LRw (ORCPT ); Tue, 30 Jun 2015 07:17:52 -0400 Date: Tue, 30 Jun 2015 13:17:50 +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 4/5] perf mem: Fill in the missing freeing a session after an error occur Message-ID: <20150630111750.GB25631@krava.brq.redhat.com> References: <1435652124-22414-1-git-send-email-treeze.taeung@gmail.com> <1435652124-22414-5-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435652124-22414-5-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 Tue, Jun 30, 2015 at 05:15:23PM +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 > --- > tools/perf/builtin-mem.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c > index da2ec06..8b6d473 100644 > --- a/tools/perf/builtin-mem.c > +++ 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; > + } > } > > - 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; hum.. how about just: ret = perf_session__process_events(session); and fall through.. also I guess we could get rid of one of those 'ret' and 'err' and use just one? jirka > > 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 >