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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-e2vs1x771fc208uvxnwcf08b@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6aa4d826
...@@ -50,7 +50,8 @@ static int process_events(union perf_event **events, size_t count) ...@@ -50,7 +50,8 @@ static int process_events(union perf_event **events, size_t count)
} }
struct test_attr_event { struct test_attr_event {
struct attr_event attr; struct perf_event_header header;
struct perf_event_attr attr;
u64 id; u64 id;
}; };
...@@ -71,21 +72,17 @@ int test__parse_no_sample_id_all(int subtest __maybe_unused) ...@@ -71,21 +72,17 @@ int test__parse_no_sample_id_all(int subtest __maybe_unused)
int err; int err;
struct test_attr_event event1 = { struct test_attr_event event1 = {
.attr = {
.header = { .header = {
.type = PERF_RECORD_HEADER_ATTR, .type = PERF_RECORD_HEADER_ATTR,
.size = sizeof(struct test_attr_event), .size = sizeof(struct test_attr_event),
}, },
},
.id = 1, .id = 1,
}; };
struct test_attr_event event2 = { struct test_attr_event event2 = {
.attr = {
.header = { .header = {
.type = PERF_RECORD_HEADER_ATTR, .type = PERF_RECORD_HEADER_ATTR,
.size = sizeof(struct test_attr_event), .size = sizeof(struct test_attr_event),
}, },
},
.id = 2, .id = 2,
}; };
struct mmap_event event3 = { struct mmap_event event3 = {
......
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