From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Wang Nan <wangnan0@huawei.com>,
Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v2 4/7] perf config: Parse arguments before setting functionality
Date: Mon, 14 Nov 2016 17:21:39 +0900 [thread overview]
Message-ID: <1479111702-5989-5-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1479111702-5989-1-git-send-email-treeze.taeung@gmail.com>
For upcoming setting functionality,
parse both config variables and values of arguments.
If setting the sort order of report functionality to srcline,
# perf config report.sort-order=srcline
we can parse config variables and values with parse_config_arg()
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/builtin-config.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 02def73..098d2df 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -82,10 +82,10 @@ static int show_config(struct perf_config_set *set)
return 0;
}
-static int parse_config_arg(const char *arg, char **var)
+static int parse_config_arg(const char *arg, char **var, char **value)
{
const char *last_dot;
- char *key;
+ char *key, *val;
key = strdup(arg);
if (!key) {
@@ -107,7 +107,37 @@ static int parse_config_arg(const char *arg, char **var)
goto out_err;
}
- *var = key;
+ val = strchr(key, '=');
+ if (val == NULL) {
+ *var = key;
+ return 0;
+ } else if (!strcmp(val, "=")) {
+ pr_err("The config variable does not contain a value: %s\n", arg);
+ goto out_err;
+ } else {
+ char *v, *ptr;
+
+ *value = strdup(val + 1); /* excluding a first character '=' */
+ if (*value == NULL) {
+ pr_err("%s: strdup failed\n", __func__);
+ goto out_err;
+ }
+
+ ptr = key;
+ v = strsep(&key, "=");
+ if (v[0] == '\0') {
+ pr_err("invalid config variable: %s\n", arg);
+ goto out_err;
+ }
+
+ *var = strdup(v);
+ free(ptr);
+ if (*var == NULL) {
+ pr_err("%s: strdup failed\n", __func__);
+ return -1;
+ }
+ }
+
return 0;
out_err:
free(key);
@@ -169,11 +199,14 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
for (i = 0; argv[i]; i++) {
char *var = NULL;
+ char *value = NULL;
- if (parse_config_arg(argv[i], &var) < 0)
+ if (parse_config_arg(argv[i], &var, &value) < 0)
break;
- ret = show_spec_config(set, var);
+ if (value == NULL)
+ ret = show_spec_config(set, var);
free(var);
+ free(value);
}
}
--
2.7.4
next prev parent reply other threads:[~2016-11-14 8:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 8:21 [PATCH v2 0/7] perf config: Add support for config read/write Taeung Song
2016-11-14 8:21 ` [PATCH v2 1/7] perf config: Add support for getting functionality Taeung Song
2016-11-14 8:21 ` [PATCH v2 2/7] perf config: Document examples getting config info in man page Taeung Song
2016-11-14 8:21 ` [PATCH v2 3/7] perf config: Parse arguments before getting functionality Taeung Song
2016-11-14 8:21 ` Taeung Song [this message]
2016-11-14 8:21 ` [PATCH v2 5/7] perf config: Add support for write functionality Taeung Song
2016-11-14 8:21 ` [PATCH v2 6/7] perf config: Document config setting examples in man page Taeung Song
2016-11-14 8:21 ` [PATCH v2 7/7] perf config: Mark where are config items from (user or system) Taeung Song
2016-11-14 8:46 ` [PATCH v2 0/7] perf config: Add support for config read/write 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=1479111702-5989-5-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
/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