From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161958AbcE3T3c (ORCPT ); Mon, 30 May 2016 15:29:32 -0400 Received: from mail.kernel.org ([198.145.29.136]:41611 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161710AbcE3T3b (ORCPT ); Mon, 30 May 2016 15:29:31 -0400 Date: Mon, 30 May 2016 16:29:26 -0300 From: Arnaldo Carvalho de Melo To: Taeung Song Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Jiri Olsa Subject: Re: [PATCH v3 3/7] perf config: Modify perf_config_set__delete() using global variable 'config_set' Message-ID: <20160530192926.GB2563@kernel.org> References: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com> <1464626651-1523-4-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1464626651-1523-4-git-send-email-treeze.taeung@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Tue, May 31, 2016 at 01:44:07AM +0900, Taeung Song escreveu: > This function deleted allocated config set but > the global variable 'config_set' is used all around > so this directly remove 'config_set' instead of using local variable 'set'. Keep it like it is, i.e. foo__delete() acts on something returned by foo__new(), for consistency. We may want to, for instance, have two instances returned by foo__new() and then call the destructor for each. - Arnaldo > Cc: Namhyung Kim > Cc: Jiri Olsa > Cc: Masami Hiramatsu > Cc: Alexander Shishkin > Signed-off-by: Taeung Song > --- > tools/perf/builtin-config.c | 2 +- > tools/perf/util/config.c | 8 ++++---- > tools/perf/util/config.h | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c > index b3bc01a..255015e 100644 > --- a/tools/perf/builtin-config.c > +++ b/tools/perf/builtin-config.c > @@ -105,7 +105,7 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) > usage_with_options(config_usage, config_options); > } > > - perf_config_set__delete(config_set); > + perf_config_set__delete(); > out_err: > return ret; > } > diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c > index adf2bad..68def9a 100644 > --- a/tools/perf/util/config.c > +++ b/tools/perf/util/config.c > @@ -642,7 +642,7 @@ static int collect_config(const char *var, const char *value, > > out_free: > free(key); > - perf_config_set__delete(set); > + perf_config_set__delete(); > return -1; > } > > @@ -740,10 +740,10 @@ static void perf_config_set__purge(struct perf_config_set *set) > } > } > > -void perf_config_set__delete(struct perf_config_set *set) > +void perf_config_set__delete(void) > { > - perf_config_set__purge(set); > - free(set); > + perf_config_set__purge(config_set); > + zfree(&config_set); > } > > /* > diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h > index ea157a4..e9b47b3 100644 > --- a/tools/perf/util/config.h > +++ b/tools/perf/util/config.h > @@ -23,6 +23,6 @@ struct perf_config_set { > extern struct perf_config_set *config_set; > > struct perf_config_set *perf_config_set__new(void); > -void perf_config_set__delete(struct perf_config_set *set); > +void perf_config_set__delete(void); > > #endif /* __PERF_CONFIG_H */ > -- > 2.5.0