perf tests: Synthesize struct instead of using field after variable sized type
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 423d856a4d6ab26a50309fd051f2bdf0e5d00fd6 Gitweb: http://git.kernel.org/tip/423d856a4d6ab26a50309fd051f2bdf0e5d00fd6 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 14 Feb 2017 15:04:48 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 14 Feb 2017 15:19:18 -0300
perf tests: Synthesize struct instead of using field after variable sized type
End result is the same, its an ABI, so the struct won't change, avoid using a GNU extension, so that we can catch other cases that may be bugs.
Caught when building with clang:
tests/parse-no-sample-id-all.c:53:20: error: field 'attr' with variable sized type 'struct attr_event' not at the end of a struct or class is a GNU extension
[-Werror,-Wgnu-variable-sized-type-not-at-end]
struct attr_event attr;
^1 error generated.
Testing it:
# perf test sample_id 24: Parse with no sample_id_all bit set : Ok #
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/parse-no-sample-id-all.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
tools/perf/tests/parse-no-sample-id-all.c +8 -11
@@ -50,7 +50,8 @@ static int process_events(union perf_event **events, size_t count) }struct test_attr_event { -struct attr_event attr; +struct perf_event_header header; +struct perf_event_attr attr;u64 id; };
@@ -71,20 +72,16 @@ int test__parse_no_sample_id_all(int subtest __maybe_unused)int err;struct test_attr_event event1 = { - .attr = { - .header = { - .type =PERF_RECORD_HEADER_ATTR , - .size =sizeof (struct test_attr_event ), - }, + .header = { + .type =PERF_RECORD_HEADER_ATTR , + .size =sizeof (struct test_attr_event ), }, .id =1 , };struct test_attr_event event2 = { - .attr = { - .header = { - .type =PERF_RECORD_HEADER_ATTR , - .size =sizeof (struct test_attr_event ), - }, + .header = { + .type =PERF_RECORD_HEADER_ATTR , + .size =sizeof (struct test_attr_event ), }, .id =2 , };