linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Taeung Song <treeze.taeung@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH v5 8/9] perf config: Reset the config set at only 'config' sub-command
Date: Wed,  1 Jun 2016 02:26:48 +0900	[thread overview]
Message-ID: <1464715609-12401-9-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1464715609-12401-1-git-send-email-treeze.taeung@gmail.com>

When first calling perf_config(), the config set is
initialized collecting both user and system config files
(i.e. user config ~/.perfconfig and system config
$(sysconfdir)/perfconfig) so config set contains
not only user config but also system config key-value pairs.
(User config has higher priority than system config.)

But 'config' sub-command individually use the config set
so free the existing config set (i.e. a global variable config_set)
before reinstantiating it.

And 'config' sub-command have '--user' or '--system' options.
To reinitialize with the options, the config set should be reset
at the very beginning at cmd_config()

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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index f23fe52..4dab41e 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -79,6 +79,11 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
 	else if (use_user_config)
 		config_exclusive_filename = user_config;
 
+	/*
+	 * Reset the config set at only 'config' sub-command
+	 * because of reinitializing with options config file location.
+	 */
+	perf_config_set__delete(&config_set);
 	config_set = perf_config_set__new();
 	if (!config_set) {
 		ret = -1;
-- 
2.5.0

  parent reply	other threads:[~2016-05-31 17:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 17:26 [RFC][PATCH v5 0/9] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-05-31 17:26 ` [BUGFIX][PATCH v5 1/9] perf config: Let perf_config() return in case of failure Taeung Song
2016-05-31 17:26 ` [BUGFIX][PATCH v5 2/9] perf config: Finally free a config set after collect_config() worked Taeung Song
2016-05-31 17:26 ` [BUGFIX][PATCH v5 3/9] perf config: Handle an error when config set is NULL at collect_config() Taeung Song
2016-05-31 17:26 ` [PATCH v5 4/9] perf config: Use new perf_config_set__init() to initialize config set Taeung Song
2016-05-31 17:26 ` [PATCH v5 5/9] perf config: Add global variable 'config_set' Taeung Song
2016-05-31 17:26 ` [PATCH v5 6/9] perf config: Use zfree() instead of free() at perf_config_set__delete() Taeung Song
2016-05-31 17:26 ` [PATCH v5 7/9] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-05-31 17:26 ` Taeung Song [this message]
2016-05-31 17:26 ` [PATCH v5 9/9] perf config: Reimplement show_config() using perf_config() Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464715609-12401-9-git-send-email-treeze.taeung@gmail.com \
    --to=treeze.taeung@gmail.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).