perf evsel: Do not put a variable sized type not at the end of a struct
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: c24ae6d96112b10ef703a58d7d74583716d2ce69 Gitweb: http://git.kernel.org/tip/c24ae6d96112b10ef703a58d7d74583716d2ce69 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 14 Feb 2017 10:59:04 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 14 Feb 2017 15:56:54 -0300
perf evsel: Do not put a variable sized type not at the end of a struct
As this is a GNU extension and while harmless in this case, we can do the same thing in a more clearer way by using a existing thread_map and cpu_map constructors:
With this we avoid this while compiling with clang:
util/evsel.c:1659:17: error: field 'map' with variable sized type 'struct cpu_map' not at the end of a struct or class is a GNU extension
[-Werror,-Wgnu-variable-sized-type-not-at-end]
struct cpu_map map;
^
util/evsel.c:1667:20: error: field 'map' with variable sized type 'struct thread_map' not at the end of a struct or class is a GNU extension
[-Werror,-Wgnu-variable-sized-type-not-at-end]
struct thread_map map;
^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/util/evsel.c | 62 ++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 34 deletions(-)
tools/perf/util/evsel.c +28 -34
@@ -1448,8 +1448,8 @@ static bool ignore_missing_thread(struct perf_evsel *evsel,return true; } -static int __perf_evsel__open (struct perf_evsel *evsel,struct cpu_map *cpus, -struct thread_map *threads) +int perf_evsel__open (struct perf_evsel *evsel,struct cpu_map *cpus, +struct thread_map *threads) {int cpu, thread, nthreads;unsigned long flags =PERF_FLAG_FD_CLOEXEC ;
@@ -1459,6 +1459,30 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,if (perf_missing_features.write_backward && evsel->attr.write_backward)return -EINVAL ; +if (cpus ==NULL ) { +static struct cpu_map *empty_cpu_map; + +if (empty_cpu_map ==NULL ) { + empty_cpu_map =cpu_map__dummy_new (); +if (empty_cpu_map ==NULL ) +return -ENOMEM ; + } + + cpus = empty_cpu_map; + } + +if (threads ==NULL ) { +static struct thread_map *empty_thread_map; + +if (empty_thread_map ==NULL ) { + empty_thread_map =thread_map__new_by_tid (-1 ); +if (empty_thread_map ==NULL ) +return -ENOMEM ; + } + + threads = empty_thread_map; + } +if (evsel->system_wide) nthreads =1 ;else
@@ -1655,46 +1679,16 @@ void perf_evsel__close(struct perf_evsel *evsel, int ncpus, int nthreads)perf_evsel__free_fd (evsel); } -static struct { -struct cpu_map map; -int cpus[1 ]; -} empty_cpu_map = { - .map.nr =1 , - .cpus = {-1 , }, -}; - -static struct { -struct thread_map map; -int threads[1 ]; -} empty_thread_map = { - .map.nr =1 , - .threads = {-1 , }, -}; - -int perf_evsel__open (struct perf_evsel *evsel,struct cpu_map *cpus, -struct thread_map *threads) -{ -if (cpus ==NULL ) { -/* Work around old compiler warnings about strict aliasing */ - cpus = &empty_cpu_map.map; - } - -if (threads ==NULL ) - threads = &empty_thread_map.map; - -return __perf_evsel__open (evsel, cpus, threads); -} -int perf_evsel__open_per_cpu (struct perf_evsel *evsel,struct cpu_map *cpus) { -return __perf_evsel__open (evsel, cpus, &empty_thread_map.map); +return perf_evsel__open (evsel, cpus,NULL ); }int perf_evsel__open_per_thread (struct perf_evsel *evsel,struct thread_map *threads) { -return __perf_evsel__open (evsel, &empty_cpu_map.map, threads); +return perf_evsel__open (evsel,NULL , threads); } static int perf_evsel__parse_id_sample(const struct perf_evsel *evsel,