From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161839AbcE3Qom (ORCPT ); Mon, 30 May 2016 12:44:42 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33213 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161697AbcE3Qoj (ORCPT ); Mon, 30 May 2016 12:44:39 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa 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 Message-Id: <1464626651-1523-8-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com> References: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Alexander Shishkin Signed-off-by: Taeung Song --- 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