2020-09-01 09:41:46

by Adrian Hunter

Subject: [PATCH V2 1/6] perf tools: Consolidate --control option parsing into one function

Consolidate --control option parsing into one function, in preparation for
adding FIFO file name options.

Signed-off-by: Adrian Hunter <[email protected]>
---
tools/perf/builtin-record.c | 22 ++--------------------
tools/perf/builtin-stat.c | 22 ++--------------------
tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++
tools/perf/util/evlist.h | 1 +
4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index f91352f847c0..f2ab5bd7e2ba 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2234,27 +2234,9 @@ static int parse_control_option(const struct option *opt,
const char *str,
int unset __maybe_unused)
{
- char *comma = NULL, *endptr = NULL;
- struct record_opts *config = (struct record_opts *)opt->value;
-
- if (strncmp(str, "fd:", 3))
- return -EINVAL;
-
- config->ctl_fd = strtoul(&str[3], &endptr, 0);
- if (endptr == &str[3])
- return -EINVAL;
-
- comma = strchr(str, ',');
- if (comma) {
- if (endptr != comma)
- return -EINVAL;
-
- config->ctl_fd_ack = strtoul(comma + 1, &endptr, 0);
- if (endptr == comma + 1 || *endptr != '\0')
- return -EINVAL;
- }
+ struct record_opts *opts = opt->value;

- return 0;
+ return evlist__parse_control(str, &opts->ctl_fd, &opts->ctl_fd_ack);
}

static void switch_output_size_warn(struct record *rec)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 483a28ef4ec4..12ce5cf2b10e 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1045,27 +1045,9 @@ static int parse_control_option(const struct option *opt,
const char *str,
int unset __maybe_unused)
{
- char *comma = NULL, *endptr = NULL;
- struct perf_stat_config *config = (struct perf_stat_config *)opt->value;
+ struct perf_stat_config *config = opt->value;

- if (strncmp(str, "fd:", 3))
- return -EINVAL;
-
- config->ctl_fd = strtoul(&str[3], &endptr, 0);
- if (endptr == &str[3])
- return -EINVAL;
-
- comma = strchr(str, ',');
- if (comma) {
- if (endptr != comma)
- return -EINVAL;
-
- config->ctl_fd_ack = strtoul(comma + 1, &endptr, 0);
- if (endptr == comma + 1 || *endptr != '\0')
- return -EINVAL;
- }
-
- return 0;
+ return evlist__parse_control(str, &config->ctl_fd, &config->ctl_fd_ack);
}

static struct option stat_options[] = {
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e3fa3bf7498a..62e3f87547ce 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1727,6 +1727,30 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
return leader;
}

+int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack)
+{
+ char *comma = NULL, *endptr = NULL;
+
+ if (strncmp(str, "fd:", 3))
+ return -EINVAL;
+
+ *ctl_fd = strtoul(&str[3], &endptr, 0);
+ if (endptr == &str[3])
+ return -EINVAL;
+
+ comma = strchr(str, ',');
+ if (comma) {
+ if (endptr != comma)
+ return -EINVAL;
+
+ *ctl_fd_ack = strtoul(comma + 1, &endptr, 0);
+ if (endptr == comma + 1 || *endptr != '\0')
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
int evlist__initialize_ctlfd(struct evlist *evlist, int fd, int ack)
{
if (fd == -1) {
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index c73f7f7f120b..a5a5a07d5c55 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -373,6 +373,7 @@ enum evlist_ctl_cmd {
EVLIST_CTL_CMD_ACK
};

+int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack);
int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);
int evlist__finalize_ctlfd(struct evlist *evlist);
bool evlist__ctlfd_initialized(struct evlist *evlist);
--
2.17.1

2020-09-02 16:08:47

by Alexey Budankov

Subject: Re: [PATCH V2 1/6] perf tools: Consolidate --control option parsing into one function

On 01.09.2020 12:37, Adrian Hunter wrote:
> Consolidate --control option parsing into one function, in preparation for
> adding FIFO file name options.
>
> Signed-off-by: Adrian Hunter <[email protected]>
> ---
> tools/perf/builtin-record.c | 22 ++--------------------
> tools/perf/builtin-stat.c | 22 ++--------------------
> tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++
> tools/perf/util/evlist.h | 1 +
> 4 files changed, 29 insertions(+), 40 deletions(-)

Acked-by: Alexei Budankov <[email protected]>

Regards,
Alexei

2020-09-03 20:16:53

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH V2 1/6] perf tools: Consolidate --control option parsing into one function

Em Wed, Sep 02, 2020 at 07:06:51PM +0300, Alexey Budankov escreveu:
>
> On 01.09.2020 12:37, Adrian Hunter wrote:
> > Consolidate --control option parsing into one function, in preparation for
> > adding FIFO file name options.
> >
> > Signed-off-by: Adrian Hunter <[email protected]>
> > ---
> > tools/perf/builtin-record.c | 22 ++--------------------
> > tools/perf/builtin-stat.c | 22 ++--------------------
> > tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++
> > tools/perf/util/evlist.h | 1 +
> > 4 files changed, 29 insertions(+), 40 deletions(-)
>
> Acked-by: Alexei Budankov <[email protected]>

Thanks, applied.

- Arnaldo