Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934585AbcKOKqd (ORCPT ); Tue, 15 Nov 2016 05:46:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51024 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933238AbcKOKq2 (ORCPT ); Tue, 15 Nov 2016 05:46:28 -0500 Date: Tue, 15 Nov 2016 02:44:19 -0800 From: tip-bot for Taeung Song Message-ID: Cc: linux-kernel@vger.kernel.org, over3025@gmail.com, tglx@linutronix.de, hpa@zytor.com, treeze.taeung@gmail.com, wangnan0@huawei.com, aweee0@gmail.com, peterz@infradead.org, acme@redhat.com, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org Reply-To: wangnan0@huawei.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, over3025@gmail.com, treeze.taeung@gmail.com, peterz@infradead.org, acme@redhat.com, aweee0@gmail.com, jolsa@kernel.org, namhyung@kernel.org, mingo@kernel.org In-Reply-To: <1478241862-31230-2-git-send-email-treeze.taeung@gmail.com> References: <1478241862-31230-2-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Add support for getting config key-value pairs Git-Commit-ID: 909236083ee58399b371d085fef5cfac9bce3ec8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4302 Lines: 142 Commit-ID: 909236083ee58399b371d085fef5cfac9bce3ec8 Gitweb: http://git.kernel.org/tip/909236083ee58399b371d085fef5cfac9bce3ec8 Author: Taeung Song AuthorDate: Fri, 4 Nov 2016 15:44:17 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 14 Nov 2016 12:52:17 -0300 perf config: Add support for getting config key-value pairs Add a functionality getting specific config key-value pairs. For the syntax examples, perf config [] [section.name ...] e.g. To query config items 'report.queue-size' and 'report.children', do # perf config report.queue-size report.children Signed-off-by: Taeung Song Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Nambong Ha Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Cc: Wookje Kwon Link: http://lkml.kernel.org/r/1478241862-31230-2-git-send-email-treeze.taeung@gmail.com [ Combined patch with docs update with this one ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-config.txt | 18 ++++++++++++++ tools/perf/builtin-config.c | 40 +++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt index cb081ac5..1714b0c 100644 --- a/tools/perf/Documentation/perf-config.txt +++ b/tools/perf/Documentation/perf-config.txt @@ -8,6 +8,8 @@ perf-config - Get and set variables in a configuration file. SYNOPSIS -------- [verse] +'perf config' [] [section.name ...] +or 'perf config' [] -l | --list DESCRIPTION @@ -118,6 +120,22 @@ Given a $HOME/.perfconfig like this: children = true group = true +To query the record mode of call graph, do + + % perf config call-graph.record-mode + +If you want to know multiple config key/value pairs, you can do like + + % perf config report.queue-size call-graph.order report.children + +To query the config value of sort order of call graph in user config file (i.e. `~/.perfconfig`), do + + % perf config --user call-graph.sort-order + +To query the config value of buildid directory in system config file (i.e. `$(sysconf)/perfconfig`), do + + % perf config --system buildid.dir + Variables ~~~~~~~~~ diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index e4207a2..df3fa1c 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -17,7 +17,7 @@ static bool use_system_config, use_user_config; static const char * const config_usage[] = { - "perf config [] [options]", + "perf config [] [options] [section.name ...]", NULL }; @@ -33,6 +33,36 @@ static struct option config_options[] = { OPT_END() }; +static int show_spec_config(struct perf_config_set *set, const char *var) +{ + struct perf_config_section *section; + struct perf_config_item *item; + + if (set == NULL) + return -1; + + perf_config_items__for_each_entry(&set->sections, section) { + if (prefixcmp(var, section->name) != 0) + continue; + + perf_config_items__for_each_entry(§ion->items, item) { + const char *name = var + strlen(section->name) + 1; + + if (strcmp(name, item->name) == 0) { + char *value = item->value; + + if (value) { + printf("%s=%s\n", var, value); + return 0; + } + } + + } + } + + return 0; +} + static int show_config(struct perf_config_set *set) { struct perf_config_section *section; @@ -54,7 +84,7 @@ static int show_config(struct perf_config_set *set) int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) { - int ret = 0; + int i, ret = 0; struct perf_config_set *set; char *user_config = mkpath("%s/.perfconfig", getenv("HOME")); @@ -100,7 +130,11 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) } break; default: - usage_with_options(config_usage, config_options); + if (argc) + for (i = 0; argv[i]; i++) + ret = show_spec_config(set, argv[i]); + else + usage_with_options(config_usage, config_options); } perf_config_set__delete(set);