From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932453AbcFGJ1p (ORCPT ); Tue, 7 Jun 2016 05:27:45 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35474 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932396AbcFGJ0l (ORCPT ); Tue, 7 Jun 2016 05:26:41 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa Subject: [PATCH v7 4/7] perf config: Use zfree() instead of free() at perf_config_set__delete() Date: Tue, 7 Jun 2016 18:26:14 +0900 Message-Id: <1465291577-20973-5-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1465291577-20973-1-git-send-email-treeze.taeung@gmail.com> References: <1465291577-20973-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf_config_set__delete() delete allocated the config set but the global variable 'config_set' is used all around. So purge and zfree by an address of the global variable , i.e. 'struct perf_config_set **' type instead of using local variable 'set' of which type is 'struct perf_config_set *'. 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 | 11 +++++++---- tools/perf/util/config.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index b3bc01a..f23fe52 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(&config_set); out_err: return ret; } diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 02fc6d5..2441585 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -699,7 +699,7 @@ struct perf_config_set *perf_config_set__new(void) if (set) { INIT_LIST_HEAD(&set->sections); if (perf_config_set__init(set) < 0) { - perf_config_set__delete(set); + perf_config_set__delete(&set); set = NULL; } } @@ -741,10 +741,13 @@ 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(struct perf_config_set **set) { - perf_config_set__purge(set); - free(set); + if (*set == NULL) + return; + + perf_config_set__purge(*set); + zfree(set); } /* diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index ea157a4..271b429 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(struct perf_config_set **set); #endif /* __PERF_CONFIG_H */ -- 2.5.0