diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-16 16:32:41 -0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-16 22:05:49 +0100 |
| commit | 84fe8488ade7922afa9f3aa77c22d2d92beb9660 (patch) | |
| tree | d2a5e1f091f2459e1ecebd2f286a04e5171f1978 | |
| parent | 82164161679c448f33092945ea97cb547a13683a (diff) | |
| download | blackbird-op-linux-84fe8488ade7922afa9f3aa77c22d2d92beb9660.tar.gz blackbird-op-linux-84fe8488ade7922afa9f3aa77c22d2d92beb9660.zip | |
perf symbols: Pass the offset to perf_header__read_build_ids()
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1258396365-29217-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | tools/perf/util/data_map.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/data_map.h | 2 | ||||
| -rw-r--r-- | tools/perf/util/header.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/util/data_map.c b/tools/perf/util/data_map.c index aacb814a4eff..14cb8465eb08 100644 --- a/tools/perf/util/data_map.c +++ b/tools/perf/util/data_map.c @@ -70,11 +70,10 @@ process_event(event_t *event, unsigned long offset, unsigned long head) } } -int perf_header__read_build_ids(int input, off_t size) +int perf_header__read_build_ids(int input, off_t offset, off_t size) { struct build_id_event bev; char filename[PATH_MAX]; - off_t offset = lseek(input, 0, SEEK_CUR); off_t limit = offset + size; int err = -1; diff --git a/tools/perf/util/data_map.h b/tools/perf/util/data_map.h index 20b4037a8236..ae036ecd7625 100644 --- a/tools/perf/util/data_map.h +++ b/tools/perf/util/data_map.h @@ -27,6 +27,6 @@ int mmap_dispatch_perf_file(struct perf_header **pheader, int full_paths, int *cwdlen, char **cwd); -int perf_header__read_build_ids(int input, off_t file_size); +int perf_header__read_build_ids(int input, off_t offset, off_t file_size); #endif diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index ebed4f44ed36..ca0d657eefad 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -359,7 +359,7 @@ static void perf_header__adds_read(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++]; lseek(fd, buildid_sec->offset, SEEK_SET); - if (perf_header__read_build_ids(fd, buildid_sec->size)) + if (perf_header__read_build_ids(fd, buildid_sec->offset, buildid_sec->size)) pr_debug("failed to read buildids, continuing...\n"); } |
