leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Read the build-ids from the header layer

Browse Source 
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:
Frederic Weisbecker 2009-11-11 04:51:05 +01:00 committed by Ingo Molnar
parent 57f395a7ea
commit 4778d2e4f4
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/util/data_map.c
View File

@ -70,8 +70,8 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
} }
} }
static int perf_header__read_build_ids(const struct perf_header *self, int perf_header__read_build_ids(const struct perf_header *self,
int input, off_t file_size) int input, off_t file_size)
{ {
off_t offset = self->data_offset + self->data_size; off_t offset = self->data_offset + self->data_size;
struct build_id_event bev; struct build_id_event bev;
@ -163,10 +163,6 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
if (curr_handler->sample_type_check(sample_type) < 0) if (curr_handler->sample_type_check(sample_type) < 0)
exit(-1); exit(-1);
if (perf_header__has_feat(header, HEADER_BUILD_ID) &&
perf_header__read_build_ids(header, input, input_stat.st_size))
pr_debug("failed to read buildids, continuing...\n");
if (load_kernel(NULL) < 0) { if (load_kernel(NULL) < 0) {
perror("failed to load kernel symbols"); perror("failed to load kernel symbols");
return EXIT_FAILURE; return EXIT_FAILURE;

2
tools/perf/util/data_map.h
View File

@ -27,5 +27,7 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
int full_paths, int full_paths,
int *cwdlen, int *cwdlen,
char **cwd); char **cwd);
int perf_header__read_build_ids(const struct perf_header *self,
int input, off_t file_size);
#endif #endif

14
tools/perf/util/header.c
View File

@ -9,6 +9,8 @@
#include "../perf.h" #include "../perf.h"
#include "trace-event.h" #include "trace-event.h"
#include "symbol.h" #include "symbol.h"
#include "data_map.h"
#include "debug.h"
/* /*
* Create new perf.data header attribute: * 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); trace_report(fd);
lseek(fd, trace_sec.offset + trace_sec.size, SEEK_SET); 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) 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)); 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_offset = f_header.event_types.offset;
self->event_size = f_header.event_types.size; self->event_size = f_header.event_types.size;
self->data_offset = f_header.data.offset; self->data_offset = f_header.data.offset;
self->data_size = f_header.data.size; self->data_size = f_header.data.size;
perf_header__adds_read(self, fd);
lseek(fd, self->data_offset, SEEK_SET); lseek(fd, self->data_offset, SEEK_SET);
self->frozen = 1; self->frozen = 1;