Commit 091a4ef5 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

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: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1383313899-15987-10-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 87b95524
...@@ -121,6 +121,9 @@ static bool samples_same(const struct perf_sample *s1, ...@@ -121,6 +121,9 @@ static bool samples_same(const struct perf_sample *s1,
if (type & PERF_SAMPLE_DATA_SRC) if (type & PERF_SAMPLE_DATA_SRC)
COMP(data_src); COMP(data_src);
if (type & PERF_SAMPLE_TRANSACTION)
COMP(transaction);
return true; return true;
} }
...@@ -165,6 +168,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format) ...@@ -165,6 +168,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format)
.cpu = 110, .cpu = 110,
.raw_size = sizeof(raw_data), .raw_size = sizeof(raw_data),
.data_src = 111, .data_src = 111,
.transaction = 112,
.raw_data = (void *)raw_data, .raw_data = (void *)raw_data,
.callchain = &callchain.callchain, .callchain = &callchain.callchain,
.branch_stack = &branch_stack.branch_stack, .branch_stack = &branch_stack.branch_stack,
...@@ -273,7 +277,8 @@ int test__sample_parsing(void) ...@@ -273,7 +277,8 @@ int test__sample_parsing(void)
/* /*
* Fail the test if it has not been updated when new sample format bits * 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) { 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"); pr_debug("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment