lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 3/5] perf config: Modify perf_config_set__delete() using global variable 'config_set'
Date
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'.

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
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 fe1b77f..8eef3fb 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -106,7 +106,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();
out_err:
return ret;
}
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 487d390..abfe1b2 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -594,7 +594,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;
}

@@ -741,10 +741,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 22ec626..be4e603 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -21,6 +21,6 @@ struct perf_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
\
 
 \ /
  Last update: 2016-05-24 09:41    [W:1.062 / U:0.936 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site