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 <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
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
