ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnaldo Carvalho de Melo
2020-11-30 15:09:45 -03:00
parent 78e1bc2578
commit 25f84702f3
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/builtin-kvm.c
View File

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

4
tools/perf/builtin-record.c
View File

@@ -2221,7 +2221,7 @@ static int record__parse_mmap_pages(const struct option *opt,
*p = '\0'; *p = '\0';
if (*s) { if (*s) {
ret = __perf_evlist__parse_mmap_pages(&mmap_pages, s); ret = __evlist__parse_mmap_pages(&mmap_pages, s);
if (ret) if (ret)
goto out_free; goto out_free;
opts->mmap_pages = mmap_pages; opts->mmap_pages = mmap_pages;
@@ -2232,7 +2232,7 @@ static int record__parse_mmap_pages(const struct option *opt,
goto out_free; goto out_free;
} }
ret = __perf_evlist__parse_mmap_pages(&mmap_pages, p + 1); ret = __evlist__parse_mmap_pages(&mmap_pages, p + 1);
if (ret) if (ret)
goto out_free; goto out_free;

3
tools/perf/builtin-top.c
View File

@@ -1466,8 +1466,7 @@ int cmd_top(int argc, const char **argv)
OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols, OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols,
"hide kernel symbols"), "hide kernel symbols"),
OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages", OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages",
"number of mmap data pages", "number of mmap data pages", evlist__parse_mmap_pages),
perf_evlist__parse_mmap_pages),
OPT_INTEGER('r', "realtime", &top.realtime_prio, OPT_INTEGER('r', "realtime", &top.realtime_prio,
"collect data with this RT SCHED_FIFO priority"), "collect data with this RT SCHED_FIFO priority"),
OPT_INTEGER('d', "delay", &top.delay_secs, OPT_INTEGER('d', "delay", &top.delay_secs,

3
tools/perf/builtin-trace.c
View File

@@ -4763,8 +4763,7 @@ int cmd_trace(int argc, const char **argv)
OPT_BOOLEAN(0, "no-inherit", &trace.opts.no_inherit, OPT_BOOLEAN(0, "no-inherit", &trace.opts.no_inherit,
"child tasks do not inherit counters"), "child tasks do not inherit counters"),
OPT_CALLBACK('m', "mmap-pages", &trace.opts.mmap_pages, "pages", OPT_CALLBACK('m', "mmap-pages", &trace.opts.mmap_pages, "pages",
"number of mmap data pages", "number of mmap data pages", evlist__parse_mmap_pages),
perf_evlist__parse_mmap_pages),
OPT_STRING('u', "uid", &trace.opts.target.uid_str, "user", OPT_STRING('u', "uid", &trace.opts.target.uid_str, "user",
"user to profile"), "user to profile"),
OPT_CALLBACK(0, "duration", &trace, "float", OPT_CALLBACK(0, "duration", &trace, "float",

7
tools/perf/util/evlist.c
View File

@@ -815,7 +815,7 @@ static long parse_pages_arg(const char *str, unsigned long min,
return pages; 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; unsigned long max = UINT_MAX;
long pages; long pages;
@@ -833,10 +833,9 @@ int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str)
return 0; return 0;
} }
int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str, int evlist__parse_mmap_pages(const struct option *opt, const char *str, int unset __maybe_unused)
int unset __maybe_unused)
{ {
return __perf_evlist__parse_mmap_pages(opt->value, str); return __evlist__parse_mmap_pages(opt->value, str);
} }
/** /**

6
tools/perf/util/evlist.h
View File

@@ -169,10 +169,8 @@ int evlist__start_workload(struct evlist *evlist);
struct option; struct option;
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);
int perf_evlist__parse_mmap_pages(const struct option *opt, int evlist__parse_mmap_pages(const struct option *opt, const char *str, int unset);
const char *str,
int unset);
unsigned long perf_event_mlock_kb_in_pages(void); unsigned long perf_event_mlock_kb_in_pages(void);