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 v3 7/7] perf config: Reset the config set at only 'config' sub-command
Date: Tue, 31 May 2016 01:44:11 +0900 [thread overview]
Message-ID: <1464626651-1523-8-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com>
When first calling perf_config(), 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 have '--user' or '--system' options.
The options is to select a particular config file location
so the config set should be reset before 'config' sub-command work.
User config file:
# cat ~/.perfconfig
[annotate]
hide_src_code = false
[tui]
report = on
System config file:
# cat /usr/local/etc/perfconfig
[annotate]
hide_src_code = true
Before:
# perf config --user --list
annotate.hide_src_code=false
ui.report=on
# perf config --system --list
annotate.hide_src_code=false
tui.report=on
After:
# perf config --user --list
annotate.hide_src_code=false
tui.report=on
# perf config --system --list
annotate.hide_src_code=true
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 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 412c725..5615631 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -64,6 +64,12 @@ 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 options config file location.
+ */
+ perf_config_set__delete();
+
switch (actions) {
case ACTION_LIST:
if (argc) {
--
2.5.0
prev parent reply other threads:[~2016-05-30 16:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 16:44 [RFC][PATCH v3 0/7] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-05-30 16:44 ` [PATCH v3 1/7] perf config: Use new perf_config_set__init() to initialize config set Taeung Song
2016-05-30 16:44 ` [PATCH v3 2/7] perf config: Add global variable 'config_set' Taeung Song
2016-05-30 16:44 ` [PATCH v3 3/7] perf config: Modify perf_config_set__delete() using " Taeung Song
2016-05-30 19:29 ` Arnaldo Carvalho de Melo
2016-05-30 22:19 ` Taeung Song
2016-05-30 16:44 ` [PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-05-30 19:32 ` Arnaldo Carvalho de Melo
2016-05-30 22:21 ` Taeung Song
2016-05-30 16:44 ` [PATCH v3 5/7] perf config: Reimplement show_config() using perf_config() Taeung Song
2016-05-30 16:44 ` [PATCH v3 6/7] perf config: Remove needless code about config set at cmd_config() Taeung Song
2016-05-30 19:35 ` Arnaldo Carvalho de Melo
2016-05-30 22:23 ` Taeung Song
2016-05-30 16:44 ` Taeung Song [this message]
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=1464626651-1523-8-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).