Messages in this thread Patch in this message | | | From | Taeung Song <> | Subject | [PATCH v15 6/9] perf config: Add 'get' functionality | Date | Thu, 11 Feb 2016 02:51:22 +0900 |
| |
This patch consists of functions which can get specific config variables. For the syntax examples,
perf config [<file-option>] [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 <namhyung@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> --- tools/perf/Documentation/perf-config.txt | 2 + tools/perf/builtin-config.c | 87 ++++++++++++++++++++++++++++++-- tools/perf/util/cache.h | 1 + 3 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt index fb74fea..c4923da 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' [<file-option>] [section.name ...] +or 'perf config' [<file-option>] -l | --list or 'perf config' [<file-option>] -a | --list-all diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 68d5014..ad7fb79 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 [<file-option>] [options]", + "perf config [<file-option>] [options] [section.name ...]", NULL }; @@ -404,6 +404,44 @@ 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); + + 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", config->section, config->name); + if (!section && !element) + printf("=%s (default)", value); + else + printf("=%s", element->value); + printf("\n"); + free(value); + return 0; + } + } + + if (section && element) { + printf("%s.%s=%s\n", section->name, + element->name, element->value); + return 0; + } + + return -1; +} + static int collect_current_config(const char *var, const char *value, void *spec_sections) { @@ -453,6 +491,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) { int i; @@ -485,7 +560,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; char *user_config = mkpath("%s/.perfconfig", getenv("HOME")); @@ -523,7 +598,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"); @@ -543,7 +617,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 92cd739..d5dcc85 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h @@ -39,6 +39,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 *); -- 2.5.0
| |