Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932652AbbKQScD (ORCPT ); Tue, 17 Nov 2015 13:32:03 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36005 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932286AbbKQSb7 (ORCPT ); Tue, 17 Nov 2015 13:31:59 -0500 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Taeung Song , Namhyung Kim , Jiri Olsa Subject: [PATCH v11 21/24] perf config: Add 'get' functionality Date: Tue, 17 Nov 2015 22:53:41 +0900 Message-Id: <1447768424-17327-21-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447768424-17327-1-git-send-email-treeze.taeung@gmail.com> References: <1447768424-17327-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 Content-Length: 5448 Lines: 185 This patch consists of functions which can get specific config variables. For the syntax examples, perf config [] [section.name ...] display key-value pairs of specific config variables # perf config report.queue-size report.children In addition, the functionality can work with --verbose option to show the config description, i.e. # perf config -v report.queue-size Cc: Namhyung Kim Cc: Jiri Olsa Signed-off-by: Taeung Song --- tools/perf/Documentation/perf-config.txt | 2 + tools/perf/builtin-config.c | 83 ++++++++++++++++++++++++++++++-- tools/perf/util/cache.h | 1 + 3 files changed, 82 insertions(+), 4 deletions(-) diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt index 61f336b..ef4ddf6 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 or 'perf config' [] -a | --list-all diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index c84ea7d..f36ac4b 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -16,7 +16,7 @@ static bool use_system_config, use_user_config; static const char * const config_usage[] = { - "perf config [] [options]", + "perf config [] [options] [section.name ...]", NULL }; @@ -387,6 +387,40 @@ static int show_all_config(struct list_head *sections) return 0; } +static int show_spec_config(struct list_head *sections, + const char *section_name, const char *name) +{ + int i; + struct config_section *section = NULL; + struct config_element *element = NULL; + + find_config(sections, §ion, &element, section_name, name); + + if (section && element) { + printf("%s.%s=%s\n", section->name, + element->name, element->value); + return 0; + } + + for (i = 0; default_configs[i].type != CONFIG_END; i++) { + struct config_item *config = &default_configs[i]; + + if (!strcmp(config->section, section_name) && + !strcmp(config->name, name)) { + char *value = get_value(config); + + if (verbose) + printf("# %s\n", config->desc); + printf("%s.%s=%s (default)\n", config->section, + config->name, value); + free(value); + return 0; + } + } + + return -1; +} + static int collect_current_config(const char *var, const char *value, void *spec_sections) { @@ -436,6 +470,43 @@ out_err: return ret; } +static int perf_configset_with_option(configset_fn_t fn, struct list_head *sections, + const char *var) +{ + int ret = -1; + char *ptr, *key; + const char *last_dot; + char *section_name, *name; + + key = ptr = strdup(var); + if (!key) { + pr_err("%s: strdup failed\n", __func__); + return -1; + } + last_dot = strchr(key, '.'); + /* + * Since "key" actually contains the section name and the real + * key name separated by a dot, we have to know where the dot is. + */ + if (last_dot == NULL || last_dot == key) { + pr_err("The config variable does not contain a section: %s\n", key); + goto out_err; + } + if (!last_dot[1]) { + pr_err("The config varible does not contain variable name: %s\n", key); + goto out_err; + } + + section_name = strsep(&ptr, "."); + name = ptr; + fn(sections, section_name, name); + ret = 0; + +out_err: + free(key); + return ret; +} + static int show_config(struct list_head *sections) { struct config_section *section; @@ -455,7 +526,7 @@ static int show_config(struct list_head *sections) int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) { - int ret = 0; + int i, ret = 0; struct list_head sections; set_option_flag(config_options, 'l', "list", PARSE_OPT_EXCLUSIVE); @@ -492,7 +563,6 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) ret = show_all_config(§ions); break; } - /* fall through */ case ACTION_LIST: if (argc) { pr_err("Error: takes no arguments\n"); @@ -508,7 +578,12 @@ 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 = perf_configset_with_option(show_spec_config, §ions, + argv[i]); + else + usage_with_options(config_usage, config_options); } return ret; diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h index e503371..71aefed 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h @@ -35,6 +35,7 @@ struct config_section { extern const char *config_exclusive_filename; typedef int (*config_fn_t)(const char *, const char *, void *); +typedef int (*configset_fn_t)(struct list_head *, const char *, const char *); extern int perf_default_config(const char *, const char *, void *); extern int perf_config(config_fn_t fn, void *); extern int perf_config_int(const char *, const char *); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/