From: Changbin Du <changbin.du@gmail.com>
To: Jiri Olsa <jolsa@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
linux-kernel@vger.kernel.org, Changbin Du <changbin.du@gmail.com>
Subject: [PATCH v8 07/18] perf: util: add general function to parse sublevel options
Date: Sat, 8 Aug 2020 10:31:30 +0800 [thread overview]
Message-ID: <20200808023141.14227-8-changbin.du@gmail.com> (raw)
In-Reply-To: <20200808023141.14227-1-changbin.du@gmail.com>
This factors out a general function perf_parse_sublevel_options() to parse
sublevel options. The 'sublevel' options is something like the '--debug'
options which allow more sublevel options.
Signed-off-by: Changbin Du <changbin.du@gmail.com>
---
v2: add util/parse-sublevel-options.c
---
tools/perf/util/Build | 1 +
tools/perf/util/debug.c | 61 ++++++---------------
tools/perf/util/parse-sublevel-options.c | 70 ++++++++++++++++++++++++
tools/perf/util/parse-sublevel-options.h | 11 ++++
4 files changed, 99 insertions(+), 44 deletions(-)
create mode 100644 tools/perf/util/parse-sublevel-options.c
create mode 100644 tools/perf/util/parse-sublevel-options.h
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 8d18380ecd10..e86607ada0b5 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -117,6 +117,7 @@ endif
perf-y += parse-branch-options.o
perf-y += dump-insn.o
perf-y += parse-regs-options.o
+perf-y += parse-sublevel-options.o
perf-y += term.o
perf-y += help-unknown-cmd.o
perf-y += mem-events.o
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index adb656745ecc..5cda5565777a 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -20,6 +20,7 @@
#include "target.h"
#include "ui/helpline.h"
#include "ui/ui.h"
+#include "util/parse-sublevel-options.h"
#include <linux/ctype.h>
@@ -173,65 +174,37 @@ void trace_event(union perf_event *event)
trace_event_printer, event);
}
-static struct debug_variable {
- const char *name;
- int *ptr;
-} debug_variables[] = {
- { .name = "verbose", .ptr = &verbose },
- { .name = "ordered-events", .ptr = &debug_ordered_events},
- { .name = "stderr", .ptr = &redirect_to_stderr},
- { .name = "data-convert", .ptr = &debug_data_convert },
- { .name = "perf-event-open", .ptr = &debug_peo_args },
+static struct sublevel_option debug_opts[] = {
+ { .name = "verbose", .value_ptr = &verbose },
+ { .name = "ordered-events", .value_ptr = &debug_ordered_events},
+ { .name = "stderr", .value_ptr = &redirect_to_stderr},
+ { .name = "data-convert", .value_ptr = &debug_data_convert },
+ { .name = "perf-event-open", .value_ptr = &debug_peo_args },
{ .name = NULL, }
};
int perf_debug_option(const char *str)
{
- struct debug_variable *var = &debug_variables[0];
- char *vstr, *s = strdup(str);
- int v = 1;
-
- vstr = strchr(s, '=');
- if (vstr)
- *vstr++ = 0;
-
- while (var->name) {
- if (!strcmp(s, var->name))
- break;
- var++;
- }
-
- if (!var->name) {
- pr_err("Unknown debug variable name '%s'\n", s);
- free(s);
- return -1;
- }
+ int ret;
- if (vstr) {
- v = atoi(vstr);
- /*
- * Allow only values in range (0, 10),
- * otherwise set 0.
- */
- v = (v < 0) || (v > 10) ? 0 : v;
- }
+ ret = perf_parse_sublevel_options(str, debug_opts);
+ if (ret)
+ return ret;
- if (quiet)
- v = -1;
+ /* Allow only verbose value in range (0, 10), otherwise set 0. */
+ verbose = (verbose < 0) || (verbose > 10) ? 0 : verbose;
- *var->ptr = v;
- free(s);
return 0;
}
int perf_quiet_option(void)
{
- struct debug_variable *var = &debug_variables[0];
+ struct sublevel_option *opt = &debug_opts[0];
/* disable all debug messages */
- while (var->name) {
- *var->ptr = -1;
- var++;
+ while (opt->name) {
+ *opt->value_ptr = -1;
+ opt++;
}
return 0;
diff --git a/tools/perf/util/parse-sublevel-options.c b/tools/perf/util/parse-sublevel-options.c
new file mode 100644
index 000000000000..a841d17ffd57
--- /dev/null
+++ b/tools/perf/util/parse-sublevel-options.c
@@ -0,0 +1,70 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "util/debug.h"
+#include "util/parse-sublevel-options.h"
+
+static int parse_one_sublevel_option(const char *str,
+ struct sublevel_option *opts)
+{
+ struct sublevel_option *opt = opts;
+ char *vstr, *s = strdup(str);
+ int v = 1;
+
+ if (!s) {
+ pr_err("no memory\n");
+ return -1;
+ }
+
+ vstr = strchr(s, '=');
+ if (vstr)
+ *vstr++ = 0;
+
+ while (opt->name) {
+ if (!strcmp(s, opt->name))
+ break;
+ opt++;
+ }
+
+ if (!opt->name) {
+ pr_err("Unknown option name '%s'\n", s);
+ free(s);
+ return -1;
+ }
+
+ if (vstr)
+ v = atoi(vstr);
+
+ *opt->value_ptr = v;
+ free(s);
+ return 0;
+}
+
+/* parse options like --foo a=<n>,b,c... */
+int perf_parse_sublevel_options(const char *str, struct sublevel_option *opts)
+{
+ char *s = strdup(str);
+ char *p = NULL;
+ int ret;
+
+ if (!s) {
+ pr_err("no memory\n");
+ return -1;
+ }
+
+ p = strtok(s, ",");
+ while (p) {
+ ret = parse_one_sublevel_option(p, opts);
+ if (ret) {
+ free(s);
+ return ret;
+ }
+
+ p = strtok(NULL, ",");
+ }
+
+ free(s);
+ return 0;
+}
diff --git a/tools/perf/util/parse-sublevel-options.h b/tools/perf/util/parse-sublevel-options.h
new file mode 100644
index 000000000000..9b9efcc2aaad
--- /dev/null
+++ b/tools/perf/util/parse-sublevel-options.h
@@ -0,0 +1,11 @@
+#ifndef _PERF_PARSE_SUBLEVEL_OPTIONS_H
+#define _PERF_PARSE_SUBLEVEL_OPTIONS_H
+
+struct sublevel_option {
+ const char *name;
+ int *value_ptr;
+};
+
+int perf_parse_sublevel_options(const char *str, struct sublevel_option *opts);
+
+#endif
\ No newline at end of file
--
2.25.1
next prev parent reply other threads:[~2020-08-08 2:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-08 2:31 [PATCH v8 00/18] [PATCH v7 00/18] perf: ftrace enhancement Changbin Du
2020-08-08 2:31 ` [PATCH v8 01/18] perf ftrace: select function/function_graph tracer automatically Changbin Du
2020-08-08 2:31 ` [PATCH v8 02/18] perf ftrace: add option '-F/--funcs' to list available functions Changbin Du
2020-08-14 11:35 ` Arnaldo Carvalho de Melo
2020-08-20 15:18 ` Changbin Du
2020-08-08 2:31 ` [PATCH v8 03/18] perf ftrace: factor out function write_tracing_file_int() Changbin Du
2020-08-08 2:31 ` [PATCH v8 04/18] perf ftrace: add option '-m/--buffer-size' to set per-cpu buffer size Changbin Du
2020-08-14 11:53 ` Arnaldo Carvalho de Melo
2020-08-14 12:12 ` Arnaldo Carvalho de Melo
2020-08-14 12:58 ` Arnaldo Carvalho de Melo
2020-08-08 2:31 ` [PATCH v8 05/18] perf ftrace: show trace column header Changbin Du
2020-08-14 11:56 ` Arnaldo Carvalho de Melo
2020-08-14 11:57 ` Arnaldo Carvalho de Melo
2020-08-08 2:31 ` [PATCH v8 06/18] perf ftrace: add option '--inherit' to trace children processes Changbin Du
2020-08-14 12:12 ` Arnaldo Carvalho de Melo
2020-08-08 2:31 ` Changbin Du [this message]
2020-08-08 2:31 ` [PATCH v8 08/18] perf ftrace: add support for tracing option 'func_stack_trace' Changbin Du
2020-08-14 12:24 ` Arnaldo Carvalho de Melo
2020-08-20 15:15 ` Changbin Du
2020-08-08 2:31 ` [PATCH v8 09/18] perf ftrace: add support for trace option sleep-time Changbin Du
2020-08-14 12:26 ` Arnaldo Carvalho de Melo
2020-08-08 2:31 ` [PATCH v8 10/18] perf ftrace: add support for trace option funcgraph-irqs Changbin Du
2020-08-14 12:27 ` Arnaldo Carvalho de Melo
2020-08-08 2:31 ` [PATCH v8 11/18] perf ftrace: add support for tracing option 'irq-info' Changbin Du
2020-08-14 12:28 ` Arnaldo Carvalho de Melo
2020-08-20 15:09 ` Changbin Du
2020-08-08 2:31 ` [PATCH v8 12/18] perf ftrace: add option 'verbose' to show more info for graph tracer Changbin Du
2020-08-08 2:31 ` [PATCH v8 13/18] perf ftrace: add support for trace option tracing_thresh Changbin Du
2020-08-14 12:33 ` Arnaldo Carvalho de Melo
2020-08-20 15:08 ` Changbin Du
2020-08-08 2:31 ` [PATCH v8 14/18] perf: ftrace: allow set graph depth by '--graph-opts' Changbin Du
2020-08-08 2:31 ` [PATCH v8 15/18] perf ftrace: add option -D/--delay to delay tracing Changbin Du
2020-08-08 2:31 ` [PATCH v8 16/18] perf ftrace: add option --tid to filter by thread id Changbin Du
2020-08-08 2:31 ` [PATCH v8 17/18] perf: ftrace: Add set_tracing_options() to set all trace options Changbin Du
2020-08-08 2:31 ` [PATCH v8 18/18] perf ftrace: add change log Changbin Du
2020-08-14 12:38 ` [PATCH v8 00/18] [PATCH v7 00/18] perf: ftrace enhancement Arnaldo Carvalho de Melo
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=20200808023141.14227-8-changbin.du@gmail.com \
--to=changbin.du@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).