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 <adrian.hunter@intel.com>
Acked-by: Alexey Budankov <alexey.budankov@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20200901093758.32293-2-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 772f105..50591e0 100644 (file)
--- 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 fddc97c..ea072d4 100644 (file)
--- 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 e3fa3bf..62e3f87 100644 (file)
--- 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 c73f7f7..a5a5a07 100644 (file)
--- 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);