perf record: 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 an existing thread_map
constructor.

With this we avoid this while compiling with clang:

  builtin-record.c:659:21: 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;
                                    ^
  1 error generated.

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-c9drclo52ezxmwa7qxklin2y@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2ddf189968dc..6cd6776052e7 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -655,22 +655,23 @@ record__finish_output(struct record *rec)
 
 static int record__synthesize_workload(struct record *rec, bool tail)
 {
-        struct {
-                struct thread_map map;
-                struct thread_map_data map_data;
-        } thread_map;
+        int err;
+        struct thread_map *thread_map;
 
         if (rec->opts.tail_synthesize != tail)
                 return 0;
 
-        thread_map.map.nr = 1;
-        thread_map.map.map[0].pid = rec->evlist->workload.pid;
-        thread_map.map.map[0].comm = NULL;
-        return perf_event__synthesize_thread_map(&rec->tool, &thread_map.map,
+        thread_map = thread_map__new_by_tid(rec->evlist->workload.pid);
+        if (thread_map == NULL)
+                return -1;
+
+        err = perf_event__synthesize_thread_map(&rec->tool, thread_map,
                                                  process_synthesized_event,
                                                  &rec->session->machines.host,
                                                  rec->opts.sample_address,
                                                  rec->opts.proc_map_timeout);
+        thread_map__put(thread_map);
+        return err;
 }
 
 static int record__synthesize(struct record *rec, bool tail);