From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com,
namhyung@kernel.org, Ingo Molnar <mingo@redhat.com>,
Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v7 4/7] perf config: Add 'get' functionality
Date: Sun, 4 Oct 2015 16:35:07 +0900 [thread overview]
Message-ID: <1443944110-6414-5-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1443944110-6414-1-git-send-email-treeze.taeung@gmail.com>
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
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/Documentation/perf-config.txt | 2 +
tools/perf/builtin-config.c | 75 ++++++++++++++++++++++++++++++--
tools/perf/util/cache.h | 1 +
3 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 15fbbd9..7b83406 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 8e16e18..731056c 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
};
@@ -452,6 +452,35 @@ 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_configsets[i].section_name != NULL; i++) {
+ struct default_configset *config = &default_configsets[i];
+
+ if (!strcmp(config->section_name, section_name) &&
+ !strcmp(config->name, name)) {
+ printf("%s.%s=%s (default)\n", config->section_name,
+ config->name, config->value);
+ return 0;
+ }
+ }
+
+ return -1;
+}
+
static int collect_current_config(const char *var, const char *value,
void *spec_sections __maybe_unused)
{
@@ -497,9 +526,42 @@ static int collect_current_config(const char *var, const char *value,
return 0;
}
+static int perf_configset_with_option(configset_fn_t fn, struct list_head *sections,
+ const char *var)
+{
+ char *section_name;
+ char *name;
+ const char *last_dot;
+ char *key = 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);
+ return -1;
+ }
+ if (!last_dot[1]) {
+ pr_err("The config varible does not contain variable name: %s\n", key);
+ return -1;
+ }
+
+ section_name = strsep(&key, ".");
+ name = strsep(&key, ".");
+ free(key);
+
+ return fn(sections, section_name, name);
+}
+
int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
{
- int ret = 0;
+ int i, ret = 0;
struct list_head sections;
const char *system_config = perf_etc_perfconfig();
char *user_config = mkpath("%s/.perfconfig", getenv("HOME"));
@@ -532,7 +594,6 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
break;
}
case ACTION_LIST:
- default:
if (argc) {
pr_err("Error: takes no arguments\n");
if (actions == ACTION_LIST_ALL)
@@ -540,7 +601,13 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
else
parse_options_usage(config_usage, config_options, "l", 1);
return -1;
- } else
+ }
+ default:
+ if (argc)
+ for (i = 0; argv[i]; i++)
+ ret = perf_configset_with_option(show_spec_config, §ions,
+ argv[i]);
+ else
ret = show_config(§ions);
}
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 712e82b..e9bb75e 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -33,6 +33,7 @@ struct config_section {
};
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_from_file(config_fn_t fn, const char *filename, void *data);
--
1.9.1
next prev parent reply other threads:[~2015-10-04 8:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-04 7:35 [PATCH v7 0/7] perf tools: Add 'perf-config' command Taeung Song
2015-10-04 7:35 ` [PATCH v7 1/7] " Taeung Song
2015-10-21 3:10 ` Namhyung Kim
2015-10-04 7:35 ` [PATCH v7 2/7] perf config: Add '--system' and '--user' options to select which config file is used Taeung Song
2015-10-21 4:20 ` Namhyung Kim
2015-10-21 10:32 ` TaeWoong Song
2015-10-04 7:35 ` [PATCH v7 3/7] perf config: Add a option 'list-all' to perf-config Taeung Song
2015-10-21 5:11 ` Namhyung Kim
2015-10-04 7:35 ` Taeung Song [this message]
2015-10-04 7:35 ` [PATCH v7 5/7] perf config: Add 'set' feature Taeung Song
2015-10-04 7:35 ` [PATCH v7 6/7] perf config: normalize a value depending on default type of it Taeung Song
2015-10-04 7:35 ` [PATCH v7 7/7] perf config: Add a option 'remove' to perf-config Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443944110-6414-5-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome