perf tools: Bring linear set of section headers for features

[~andy/linux] / tools / perf / util / header.c

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 9709d38113b136b4909b8f45cc3e16c095c0e865..ebed4f44ed36f8dff5641a0655956dcdc495088e 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -186,41 +186,58 @@ static void write_buildid_table(int fd, struct list_head *id_head)
 }
 
 static void
-perf_header__adds_write(struct perf_header *self, int fd, bool at_exit)
+perf_header__adds_write(struct perf_header *self, int fd)
 {
-       struct perf_file_section trace_sec;
-       u64 cur_offset = lseek(fd, 0, SEEK_CUR);
+       LIST_HEAD(id_list);
+       int nr_sections;
+       struct perf_file_section *feat_sec;
+       int sec_size;
+       u64 sec_start;
+       int idx = 0;
+
+       if (fetch_build_id_table(&id_list))
+               perf_header__set_feat(self, HEADER_BUILD_ID);
+
+       nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
+       if (!nr_sections)
+               return;
+
+       feat_sec = calloc(sizeof(*feat_sec), nr_sections);
+       if (!feat_sec)
+               die("No memory");
+
+       sec_size = sizeof(*feat_sec) * nr_sections;
+
+       sec_start = self->data_offset + self->data_size;
+       lseek(fd, sec_start + sec_size, SEEK_SET);
 
        if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
+               struct perf_file_section *trace_sec;
+
+               trace_sec = &feat_sec[idx++];
+
                /* Write trace info */
-               trace_sec.offset = lseek(fd, sizeof(trace_sec), SEEK_CUR);
+               trace_sec->offset = lseek(fd, 0, SEEK_CUR);
                read_tracing_data(fd, attrs, nr_counters);
-               trace_sec.size = lseek(fd, 0, SEEK_CUR) - trace_sec.offset;
-
-               /* Write trace info headers */
-               lseek(fd, cur_offset, SEEK_SET);
-               do_write(fd, &trace_sec, sizeof(trace_sec));
-
-               /*
-                * Update cur_offset. So that other (future)
-                * features can set their own infos in this place. But if we are
-                * the only feature, at least that seeks to the place the data
-                * should begin.
-                */
-               cur_offset = lseek(fd, trace_sec.offset + trace_sec.size, SEEK_SET);
+               trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset;
        }
 
-       if (at_exit) {
-               LIST_HEAD(id_list);
 
-               if (fetch_build_id_table(&id_list)) {
-                       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
-                       perf_header__set_feat(self, HEADER_BUILD_ID);
-                       write_buildid_table(fd, &id_list);
-                       lseek(fd, cur_offset, SEEK_SET);
-               }
+       if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
+               struct perf_file_section *buildid_sec;
+
+               buildid_sec = &feat_sec[idx++];
+
+               /* Write build-ids */
+               buildid_sec->offset = lseek(fd, 0, SEEK_CUR);
+               write_buildid_table(fd, &id_list);
+               buildid_sec->size = lseek(fd, 0, SEEK_CUR) - buildid_sec->offset;
        }
-};
+
+       lseek(fd, sec_start, SEEK_SET);
+       do_write(fd, feat_sec, sec_size);
+       free(feat_sec);
+}
 
 void perf_header__write(struct perf_header *self, int fd, bool at_exit)
 {
@@ -260,10 +277,11 @@ void perf_header__write(struct perf_header *self, int fd, bool at_exit)
        if (events)
                do_write(fd, events, self->event_size);
 
-       perf_header__adds_write(self, fd, at_exit);
-
        self->data_offset = lseek(fd, 0, SEEK_CUR);
 
+       if (at_exit)
+               perf_header__adds_write(self, fd);
+
        f_header = (struct perf_file_header){
                .magic     = PERF_MAGIC,
                .size      = sizeof(f_header),
@@ -308,22 +326,44 @@ static void do_read(int fd, void *buf, size_t size)
 
 static void perf_header__adds_read(struct perf_header *self, int fd)
 {
+       struct perf_file_section *feat_sec;
+       int nr_sections;
+       int sec_size;
+       int idx = 0;
+
+
+       nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
+       if (!nr_sections)
+               return;
+
+       feat_sec = calloc(sizeof(*feat_sec), nr_sections);
+       if (!feat_sec)
+               die("No memory");
+
+       sec_size = sizeof(*feat_sec) * nr_sections;
+
+       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
+
+       do_read(fd, feat_sec, sec_size);
+
        if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
-               struct perf_file_section trace_sec;
+               struct perf_file_section *trace_sec;
 
-               do_read(fd, &trace_sec, sizeof(trace_sec));
-               lseek(fd, trace_sec.offset, SEEK_SET);
+               trace_sec = &feat_sec[idx++];
+               lseek(fd, trace_sec->offset, SEEK_SET);
                trace_report(fd);
-               lseek(fd, trace_sec.offset + trace_sec.size, SEEK_SET);
        }
 
        if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
-               struct stat input_stat;
+               struct perf_file_section *buildid_sec;
 
-               fstat(fd, &input_stat);
-               if (perf_header__read_build_ids(self, fd, input_stat.st_size))
+               buildid_sec = &feat_sec[idx++];
+               lseek(fd, buildid_sec->offset, SEEK_SET);
+               if (perf_header__read_build_ids(fd, buildid_sec->size))
                        pr_debug("failed to read buildids, continuing...\n");
        }
+
+       free(feat_sec);
 };
 
 struct perf_header *perf_header__read(int fd)