[PATCH v8 4/5] perf config: Use zfree() instead of free() at perf_config_set__delete()

From: Taeung Song
Date: Wed Jun 08 2016 - 08:37:50 EST


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 <namhyung@xxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Signed-off-by: Taeung Song <treeze.taeung@xxxxxxxxx>
---
tools/perf/builtin-config.c | 2 +-
tools/perf/perf.c | 2 +-
tools/perf/util/config.c | 10 +++++-----
tools/perf/util/config.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index cfd1036..c07f744 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -110,7 +110,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(set);
+ perf_config_set__delete(&set);
out_err:
return ret;
}
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index fe2ab7c..058d5dc 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -391,7 +391,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)

perf_env__set_cmdline(&perf_env, argc, argv);
status = p->fn(argc, argv, prefix);
- perf_config_set__delete(config_set);
+ perf_config_set__delete(&config_set);
exit_browser(status);
perf_env__exit(&perf_env);
bpf__clear();
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 72db134..23fb8e4 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -654,7 +654,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;
}
}
@@ -737,13 +737,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)
{
- if (set == NULL)
+ if (*set == NULL)
return;

- perf_config_set__purge(set);
- free(set);
+ perf_config_set__purge(*set);
+ zfree(set);
}

/*
diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
index 7cc4fea..fafba86 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -34,6 +34,6 @@ const char *perf_config_dirname(const char *, const char *);
const char *perf_etc_perfconfig(void);

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