[tip:perf/core] perf test: Update "sample parsing" test for PERF_SAMPLE_TRANSACTION
Commit-ID: 091a4ef5a94d46d26a05f0c32d2f64800ed91306
Gitweb: http://git.kernel.org/tip/091a4ef5a94d46d26a05f0c32d2f64800ed91306
Author: Adrian Hunter
AuthorDate: Fri, 1 Nov 2013 15:51:37 +0200
Committer: Arnaldo Carvalho de Melo
CommitDate: Mon, 4 Nov 2013 12:47:24 -0300
perf test: Update "sample parsing" test for PERF_SAMPLE_TRANSACTION
In fact the "sample parsing" test does not automatically check new
sample type bits - they must be added to the comparison logic.
Doing that shows that the test fails because the functions
perf_event__synthesize_sample() and perf_event__sample_event_size() have
not been updated with PERF_SAMPLE_TRANSACTION either.
Signed-off-by: Adrian Hunter
Cc: Andi Kleen
Cc: David Ahern
Cc: Frederic Weisbecker
Cc: Ingo Molnar
Cc: Jiri Olsa
Cc: Mike Galbraith
Cc: Namhyung Kim
Cc: Paul Mackerras
Cc: Peter Zijlstra
Cc: Stephane Eranian
Link:
http://lkml.kernel.org/r/1383313899-15987-10-git-send-email-adrian.hun...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo
---
tools/perf/tests/sample-parsing.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/perf/tests/sample-parsing.c
b/tools/perf/tests/sample-parsing.c
index 61c9da2..1b67720 100644
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -121,6 +121,9 @@ static bool samples_same(const struct perf_sample *s1,
if (type & PERF_SAMPLE_DATA_SRC)
COMP(data_src);
+ if (type & PERF_SAMPLE_TRANSACTION)
+ COMP(transaction);
+
return true;
}
@@ -165,6 +168,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user,
u64 read_format)
.cpu= 110,
.raw_size = sizeof(raw_data),
.data_src = 111,
+ .transaction= 112,
.raw_data = (void *)raw_data,
.callchain = ,
.branch_stack = _stack.branch_stack,
@@ -273,7 +277,8 @@ int test__sample_parsing(void)
/*
* Fail the test if it has not been updated when new sample format bits
-* were added.
+* were added. Please actually update the test rather than just change
+* the condition below.
*/
if (PERF_SAMPLE_MAX > PERF_SAMPLE_TRANSACTION << 1) {
pr_debug("sample format has changed, some new PERF_SAMPLE_ bit
was introduced - test needs updating\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:perf/core] perf test: Update sample parsing test for PERF_SAMPLE_TRANSACTION
Commit-ID: 091a4ef5a94d46d26a05f0c32d2f64800ed91306
Gitweb: http://git.kernel.org/tip/091a4ef5a94d46d26a05f0c32d2f64800ed91306
Author: Adrian Hunter adrian.hun...@intel.com
AuthorDate: Fri, 1 Nov 2013 15:51:37 +0200
Committer: Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Mon, 4 Nov 2013 12:47:24 -0300
perf test: Update sample parsing test for PERF_SAMPLE_TRANSACTION
In fact the sample parsing test does not automatically check new
sample type bits - they must be added to the comparison logic.
Doing that shows that the test fails because the functions
perf_event__synthesize_sample() and perf_event__sample_event_size() have
not been updated with PERF_SAMPLE_TRANSACTION either.
Signed-off-by: Adrian Hunter adrian.hun...@intel.com
Cc: Andi Kleen a...@firstfloor.org
Cc: David Ahern dsah...@gmail.com
Cc: Frederic Weisbecker fweis...@gmail.com
Cc: Ingo Molnar mi...@redhat.com
Cc: Jiri Olsa jo...@redhat.com
Cc: Mike Galbraith efa...@gmx.de
Cc: Namhyung Kim namhy...@gmail.com
Cc: Paul Mackerras pau...@samba.org
Cc: Peter Zijlstra a.p.zijls...@chello.nl
Cc: Stephane Eranian eran...@google.com
Link:
http://lkml.kernel.org/r/1383313899-15987-10-git-send-email-adrian.hun...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
tools/perf/tests/sample-parsing.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/perf/tests/sample-parsing.c
b/tools/perf/tests/sample-parsing.c
index 61c9da2..1b67720 100644
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -121,6 +121,9 @@ static bool samples_same(const struct perf_sample *s1,
if (type PERF_SAMPLE_DATA_SRC)
COMP(data_src);
+ if (type PERF_SAMPLE_TRANSACTION)
+ COMP(transaction);
+
return true;
}
@@ -165,6 +168,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user,
u64 read_format)
.cpu= 110,
.raw_size = sizeof(raw_data),
.data_src = 111,
+ .transaction= 112,
.raw_data = (void *)raw_data,
.callchain = callchain.callchain,
.branch_stack = branch_stack.branch_stack,
@@ -273,7 +277,8 @@ int test__sample_parsing(void)
/*
* Fail the test if it has not been updated when new sample format bits
-* were added.
+* were added. Please actually update the test rather than just change
+* the condition below.
*/
if (PERF_SAMPLE_MAX PERF_SAMPLE_TRANSACTION 1) {
pr_debug(sample format has changed, some new PERF_SAMPLE_ bit
was introduced - test needs updating\n);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
