perf evlist: Use the right prefix for 'struct evlist' mmap pages parsing method

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 6161251..1105c9e 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1349,8 +1349,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
                OPT_STRING('p', "pid", &kvm->opts.target.pid, "pid",
                        "record events on existing process id"),
                OPT_CALLBACK('m', "mmap-pages", &kvm->opts.mmap_pages, "pages",
-                       "number of mmap data pages",
-                       perf_evlist__parse_mmap_pages),
+                       "number of mmap data pages", evlist__parse_mmap_pages),
                OPT_INCR('v', "verbose", &verbose,
                        "be more verbose (show counter open errors, etc)"),
                OPT_BOOLEAN('a', "all-cpus", &kvm->opts.target.system_wide,

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2a73241..92039fb 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2221,7 +2221,7 @@ static int record__parse_mmap_pages(const struct option *opt,
                *p = '\0';
 
        if (*s) {
-               ret = __perf_evlist__parse_mmap_pages(&mmap_pages, s);
+               ret = __evlist__parse_mmap_pages(&mmap_pages, s);
                if (ret)
                        goto out_free;
                opts->mmap_pages = mmap_pages;
@@ -2232,7 +2232,7 @@ static int record__parse_mmap_pages(const struct option *opt,
                goto out_free;
        }
 
-       ret = __perf_evlist__parse_mmap_pages(&mmap_pages, p + 1);
+       ret = __evlist__parse_mmap_pages(&mmap_pages, p + 1);
        if (ret)
                goto out_free;
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index f65aa1c..3673c04 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1466,8 +1466,7 @@ int cmd_top(int argc, const char **argv)
        OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols,
                    "hide kernel symbols"),
        OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages",
-                    "number of mmap data pages",
-                    perf_evlist__parse_mmap_pages),
+                    "number of mmap data pages", evlist__parse_mmap_pages),
        OPT_INTEGER('r', "realtime", &top.realtime_prio,
                    "collect data with this RT SCHED_FIFO priority"),
        OPT_INTEGER('d', "delay", &top.delay_secs,

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index fa7d57f..85b6a46 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -4763,8 +4763,7 @@ int cmd_trace(int argc, const char **argv)
        OPT_BOOLEAN(0, "no-inherit", &trace.opts.no_inherit,
                    "child tasks do not inherit counters"),
        OPT_CALLBACK('m', "mmap-pages", &trace.opts.mmap_pages, "pages",
-                    "number of mmap data pages",
-                    perf_evlist__parse_mmap_pages),
+                    "number of mmap data pages", evlist__parse_mmap_pages),
        OPT_STRING('u', "uid", &trace.opts.target.uid_str, "user",
                   "user to profile"),
        OPT_CALLBACK(0, "duration", &trace, "float",

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 7ca92a5..59264a7 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -815,7 +815,7 @@ static long parse_pages_arg(const char *str, unsigned long min,
        return pages;
 }
 
-int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str)
+int __evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str)
 {
        unsigned long max = UINT_MAX;
        long pages;
@@ -833,10 +833,9 @@ int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str)
        return 0;
 }
 
-int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,
-                                 int unset __maybe_unused)
+int evlist__parse_mmap_pages(const struct option *opt, const char *str, int unset __maybe_unused)
 {
-       return __perf_evlist__parse_mmap_pages(opt->value, str);
+       return __evlist__parse_mmap_pages(opt->value, str);
 }
 
 /**

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index ebc4550..8a5b515 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -169,10 +169,8 @@ int evlist__start_workload(struct evlist *evlist);
 
 struct option;
 
-int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str);
-int perf_evlist__parse_mmap_pages(const struct option *opt,
-                                 const char *str,
-                                 int unset);
+int __evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str);
+int evlist__parse_mmap_pages(const struct option *opt, const char *str, int unset);
 
 unsigned long perf_event_mlock_kb_in_pages(void);