Em Thu, Mar 24, 2016 at 01:52:16PM +0100, Jiri Olsa escreveu: > Add -U/-K (--all-user/--all-kernel) options to use > the perf record --all-user/--all-kernel options.
Applying this after fixing up the clash due to the first patch not being merged so far. > Link: http://lkml.kernel.org/n/[email protected] > Signed-off-by: Jiri Olsa <[email protected]> > --- > tools/perf/Documentation/perf-mem.txt | 8 ++++++++ > tools/perf/builtin-mem.c | 11 ++++++++++- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/Documentation/perf-mem.txt > b/tools/perf/Documentation/perf-mem.txt > index 6676d2784733..f8e23f50ce59 100644 > --- a/tools/perf/Documentation/perf-mem.txt > +++ b/tools/perf/Documentation/perf-mem.txt > @@ -51,6 +51,14 @@ OPTIONS > --ldload:: > Specify desired latency for loads event. > > +-K:: > +--all-kernel:: > + Configure all used events to run in kernel space. > + > +-U:: > +--all-user:: > + Configure all used events to run in user space. > + > SEE ALSO > -------- > linkperf:perf-record[1], linkperf:perf-report[1] > diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c > index bf0bfca5be20..5dad76e1c8df 100644 > --- a/tools/perf/builtin-mem.c > +++ b/tools/perf/builtin-mem.c > @@ -62,6 +62,7 @@ static int __cmd_record(int argc, const char **argv, struct > perf_mem *mem) > int rec_argc, i = 0, j; > const char **rec_argv; > int ret; > + bool all_user = false, all_kernel = false; > struct option options[] = { > OPT_CALLBACK('e', "event", &mem, "event", > "event selector. use 'perf mem record -e list' to list > available events", > @@ -69,13 +70,15 @@ static int __cmd_record(int argc, const char **argv, > struct perf_mem *mem) > OPT_UINTEGER(0, "ldlat", &perf_mem_events__loads_ldlat, "mem-loads > latency"), > OPT_INCR('v', "verbose", &verbose, > "be more verbose (show counter open errors, etc)"), > + OPT_BOOLEAN('U', "--all-user", &all_user, "collect only user level > data"), > + OPT_BOOLEAN('K', "--all-kernel", &all_kernel, "collect only kernel > level data"), > OPT_END() > }; > > argc = parse_options(argc, argv, options, record_mem_usage, > PARSE_OPT_STOP_AT_NON_OPTION); > > - rec_argc = argc + 7; /* max number of arguments */ > + rec_argc = argc + 9; /* max number of arguments */ > rec_argv = calloc(rec_argc + 1, sizeof(char *)); > if (!rec_argv) > return -1; > @@ -104,6 +107,12 @@ static int __cmd_record(int argc, const char **argv, > struct perf_mem *mem) > rec_argv[i++] = perf_mem_events__name(j); > }; > > + if (all_user) > + rec_argv[i++] = "--all-user"; > + > + if (all_kernel) > + rec_argv[i++] = "--all-kernel"; > + > for (j = 0; j < argc; j++, i++) > rec_argv[i] = argv[j]; > > -- > 2.4.3
