* Re: [PATCH] perf tests record: Allow for 'sleep' being 'coreutils'
2018-11-22 13:55 [PATCH] perf tests record: Allow for 'sleep' being 'coreutils' Adrian Hunter
@ 2018-11-26 20:06 ` Arnaldo Carvalho de Melo
2018-12-14 20:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2018-12-18 13:51 ` tip-bot for Adrian Hunter
2 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-11-26 20:06 UTC (permalink / raw)
To: Adrian Hunter; +Cc: Jiri Olsa, linux-kernel
Em Thu, Nov 22, 2018 at 03:55:45PM +0200, Adrian Hunter escreveu:
> If the 'sleep' command is provided by coreutils, then the "PERF_RECORD_*
> events & perf_sample fields" test will fail because the MMAP name is
> 'coreutils' not 'sleep', and there is an extra COMM event. Fix the test to
> detect that case.
Thanks, applied.
- Arnaldo
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/tests/perf-record.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
> index 34394cc05077..07f6bd8ed719 100644
> --- a/tools/perf/tests/perf-record.c
> +++ b/tools/perf/tests/perf-record.c
> @@ -58,6 +58,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
> char *bname, *mmap_filename;
> u64 prev_time = 0;
> bool found_cmd_mmap = false,
> + found_coreutils_mmap = false,
> found_libc_mmap = false,
> found_vdso_mmap = false,
> found_ld_mmap = false;
> @@ -254,6 +255,8 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
> if (bname != NULL) {
> if (!found_cmd_mmap)
> found_cmd_mmap = !strcmp(bname + 1, cmd);
> + if (!found_coreutils_mmap)
> + found_coreutils_mmap = !strcmp(bname + 1, "coreutils");
> if (!found_libc_mmap)
> found_libc_mmap = !strncmp(bname + 1, "libc", 4);
> if (!found_ld_mmap)
> @@ -292,7 +295,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
> }
>
> found_exit:
> - if (nr_events[PERF_RECORD_COMM] > 1) {
> + if (nr_events[PERF_RECORD_COMM] > 1 + !!found_coreutils_mmap) {
> pr_debug("Excessive number of PERF_RECORD_COMM events!\n");
> ++errs;
> }
> @@ -302,7 +305,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
> ++errs;
> }
>
> - if (!found_cmd_mmap) {
> + if (!found_cmd_mmap && !found_coreutils_mmap) {
> pr_debug("PERF_RECORD_MMAP for %s missing!\n", cmd);
> ++errs;
> }
> --
> 2.17.1
--
- Arnaldo
^ permalink raw reply [flat|nested] 4+ messages in thread* [tip:perf/core] perf tests record: Allow for 'sleep' being 'coreutils'
2018-11-22 13:55 [PATCH] perf tests record: Allow for 'sleep' being 'coreutils' Adrian Hunter
2018-11-26 20:06 ` Arnaldo Carvalho de Melo
@ 2018-12-14 20:24 ` tip-bot for Adrian Hunter
2018-12-18 13:51 ` tip-bot for Adrian Hunter
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Adrian Hunter @ 2018-12-14 20:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, jolsa, linux-kernel, adrian.hunter, hpa, acme, mingo
Commit-ID: 2e9ed1958a8412622b7f45d8a0e2658b4463dcec
Gitweb: https://git.kernel.org/tip/2e9ed1958a8412622b7f45d8a0e2658b4463dcec
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Thu, 22 Nov 2018 15:55:45 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 29 Nov 2018 20:42:48 -0300
perf tests record: Allow for 'sleep' being 'coreutils'
If the 'sleep' command is provided by coreutils, then the "PERF_RECORD_*
events & perf_sample fields" test will fail because the MMAP name is
'coreutils' not 'sleep', and there is an extra COMM event. Fix the test
to detect that case.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20181122135545.16295-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/perf-record.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 34394cc05077..07f6bd8ed719 100644
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -58,6 +58,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
char *bname, *mmap_filename;
u64 prev_time = 0;
bool found_cmd_mmap = false,
+ found_coreutils_mmap = false,
found_libc_mmap = false,
found_vdso_mmap = false,
found_ld_mmap = false;
@@ -254,6 +255,8 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
if (bname != NULL) {
if (!found_cmd_mmap)
found_cmd_mmap = !strcmp(bname + 1, cmd);
+ if (!found_coreutils_mmap)
+ found_coreutils_mmap = !strcmp(bname + 1, "coreutils");
if (!found_libc_mmap)
found_libc_mmap = !strncmp(bname + 1, "libc", 4);
if (!found_ld_mmap)
@@ -292,7 +295,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
}
found_exit:
- if (nr_events[PERF_RECORD_COMM] > 1) {
+ if (nr_events[PERF_RECORD_COMM] > 1 + !!found_coreutils_mmap) {
pr_debug("Excessive number of PERF_RECORD_COMM events!\n");
++errs;
}
@@ -302,7 +305,7 @@ found_exit:
++errs;
}
- if (!found_cmd_mmap) {
+ if (!found_cmd_mmap && !found_coreutils_mmap) {
pr_debug("PERF_RECORD_MMAP for %s missing!\n", cmd);
++errs;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [tip:perf/core] perf tests record: Allow for 'sleep' being 'coreutils'
2018-11-22 13:55 [PATCH] perf tests record: Allow for 'sleep' being 'coreutils' Adrian Hunter
2018-11-26 20:06 ` Arnaldo Carvalho de Melo
2018-12-14 20:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
@ 2018-12-18 13:51 ` tip-bot for Adrian Hunter
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Adrian Hunter @ 2018-12-18 13:51 UTC (permalink / raw)
To: linux-tip-commits
Cc: jolsa, linux-kernel, acme, hpa, adrian.hunter, mingo, tglx
Commit-ID: 2aac9f9d5b85da1cc77c51d78aa41012244f7518
Gitweb: https://git.kernel.org/tip/2aac9f9d5b85da1cc77c51d78aa41012244f7518
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Thu, 22 Nov 2018 15:55:45 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 17 Dec 2018 14:54:26 -0300
perf tests record: Allow for 'sleep' being 'coreutils'
If the 'sleep' command is provided by coreutils, then the "PERF_RECORD_*
events & perf_sample fields" test will fail because the MMAP name is
'coreutils' not 'sleep', and there is an extra COMM event. Fix the test
to detect that case.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20181122135545.16295-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/perf-record.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 34394cc05077..07f6bd8ed719 100644
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -58,6 +58,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
char *bname, *mmap_filename;
u64 prev_time = 0;
bool found_cmd_mmap = false,
+ found_coreutils_mmap = false,
found_libc_mmap = false,
found_vdso_mmap = false,
found_ld_mmap = false;
@@ -254,6 +255,8 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
if (bname != NULL) {
if (!found_cmd_mmap)
found_cmd_mmap = !strcmp(bname + 1, cmd);
+ if (!found_coreutils_mmap)
+ found_coreutils_mmap = !strcmp(bname + 1, "coreutils");
if (!found_libc_mmap)
found_libc_mmap = !strncmp(bname + 1, "libc", 4);
if (!found_ld_mmap)
@@ -292,7 +295,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
}
found_exit:
- if (nr_events[PERF_RECORD_COMM] > 1) {
+ if (nr_events[PERF_RECORD_COMM] > 1 + !!found_coreutils_mmap) {
pr_debug("Excessive number of PERF_RECORD_COMM events!\n");
++errs;
}
@@ -302,7 +305,7 @@ found_exit:
++errs;
}
- if (!found_cmd_mmap) {
+ if (!found_cmd_mmap && !found_coreutils_mmap) {
pr_debug("PERF_RECORD_MMAP for %s missing!\n", cmd);
++errs;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread