Messages in this thread Patch in this message | | | Date | Tue, 24 Jun 2014 22:52:08 -0700 | From | tip-bot for Davidlohr Bueso <> | Subject | [tip:perf/core] perf bench mem: The -o and -n options are mutually exclusive |
| |
Commit-ID: 424e9634887842ac59c1d06d3264aaeb18853c0b Gitweb: http://git.kernel.org/tip/424e9634887842ac59c1d06d3264aaeb18853c0b Author: Davidlohr Bueso <davidlohr@hp.com> AuthorDate: Mon, 16 Jun 2014 11:14:25 -0700 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 19 Jun 2014 16:13:16 -0300
perf bench mem: The -o and -n options are mutually exclusive
-o, --only-prefault Show only the result with page faults before mem* -n, --no-prefault Show only the result without page faults before mem*
Makes no sense to call together. Applies to both memset and memcpy.
Signed-off-by: Davidlohr Bueso <davidlohr@hp.com> Cc: Aswin Chandramouleeswaran <aswin@hp.com> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Cc: Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/r/1402942467-10671-8-git-send-email-davidlohr@hp.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/bench/mem-memcpy.c | 5 +++++ tools/perf/bench/mem-memset.c | 5 +++++ 2 files changed, 10 insertions(+)
diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c index 5ce71d3..e622c3e 100644 --- a/tools/perf/bench/mem-memcpy.c +++ b/tools/perf/bench/mem-memcpy.c @@ -189,6 +189,11 @@ int bench_mem_memcpy(int argc, const char **argv, argc = parse_options(argc, argv, options, bench_mem_memcpy_usage, 0); + if (no_prefault && only_prefault) { + fprintf(stderr, "Invalid options: -o and -n are mutually exclusive\n"); + return 1; + } + if (use_cycle) init_cycle(); diff --git a/tools/perf/bench/mem-memset.c b/tools/perf/bench/mem-memset.c index 9af79d2..2a65468 100644 --- a/tools/perf/bench/mem-memset.c +++ b/tools/perf/bench/mem-memset.c @@ -181,6 +181,11 @@ int bench_mem_memset(int argc, const char **argv, argc = parse_options(argc, argv, options, bench_mem_memset_usage, 0); + if (no_prefault && only_prefault) { + fprintf(stderr, "Invalid options: -o and -n are mutually exclusive\n"); + return 1; + } + if (use_cycle) init_cycle();
| |