perf tools: Read the build-ids from the header layer
Keep the build-ids reading implementation in the data mapping but move its call to the headers so that we have a better control on it (offset seeking, size passing, etc..). Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> LKML-Reference: <1257911467-28276-4-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
committed by
Ingo Molnar
parent
57f395a7ea
commit
4778d2e4f4
@ -9,6 +9,8 @@
|
||||
#include "../perf.h"
|
||||
#include "trace-event.h"
|
||||
#include "symbol.h"
|
||||
#include "data_map.h"
|
||||
#include "debug.h"
|
||||
|
||||
/*
|
||||
* Create new perf.data header attribute:
|
||||
@ -322,6 +324,14 @@ static void perf_header__adds_read(struct perf_header *self, int fd)
|
||||
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;
|
||||
|
||||
fstat(fd, &input_stat);
|
||||
if (perf_header__read_build_ids(self, fd, input_stat.st_size))
|
||||
pr_debug("failed to read buildids, continuing...\n");
|
||||
}
|
||||
};
|
||||
|
||||
struct perf_header *perf_header__read(int fd)
|
||||
@ -382,14 +392,14 @@ struct perf_header *perf_header__read(int fd)
|
||||
|
||||
memcpy(&self->adds_features, &f_header.adds_features, sizeof(f_header.adds_features));
|
||||
|
||||
perf_header__adds_read(self, fd);
|
||||
|
||||
self->event_offset = f_header.event_types.offset;
|
||||
self->event_size = f_header.event_types.size;
|
||||
|
||||
self->data_offset = f_header.data.offset;
|
||||
self->data_size = f_header.data.size;
|
||||
|
||||
perf_header__adds_read(self, fd);
|
||||
|
||||
lseek(fd, self->data_offset, SEEK_SET);
|
||||
|
||||
self->frozen = 1;
|
||||
|
Reference in New Issue
Block a user