aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/session.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-01-13 10:22:17 -0500
committerIngo Molnar <mingo@elte.hu>2010-01-13 11:39:43 -0500
commitb7cece76783c68fb391f9882235b4b0c9c300c46 (patch)
tree8a0224493acc3cf74c218384a3b76b3e47c131a2 /tools/perf/util/session.c
parentff314d3903c2843de65c2148f66f277f2440ed26 (diff)
perf tools: Encode kernel module mappings in perf.data
We were always looking at the running machine /proc/modules, even when processing a perf.data file, which only makes sense when we're doing 'perf record' and 'perf report' on the same machine, and in close sucession, or if we don't use modules at all, right Peter? ;-) Now, at 'perf record' time we read /proc/modules, find the long path for modules, and put them as PERF_MMAP events, just like we did to encode the reloc reference symbol for vmlinux. Talking about that now it is encoded in .pgoff, so that we can use .{start,len} to store the address boundaries for the kernel so that when we reconstruct the kmaps tree we can do lookups right away, without having to fixup the end of the kernel maps like we did in the past (and now only in perf record). One more step in the 'perf archive' direction when we'll finally be able to collect data in one machine and analyse in another. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <1263396139-4798-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r--tools/perf/util/session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 378ac5422bcf..fd1c5a39a5bb 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -69,9 +69,6 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc
69 self->unknown_events = 0; 69 self->unknown_events = 0;
70 map_groups__init(&self->kmaps); 70 map_groups__init(&self->kmaps);
71 71
72 if (perf_session__create_kernel_maps(self) < 0)
73 goto out_delete;
74
75 if (mode == O_RDONLY && perf_session__open(self, force) < 0) 72 if (mode == O_RDONLY && perf_session__open(self, force) < 0)
76 goto out_delete; 73 goto out_delete;
77 74
@@ -268,8 +265,11 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
268 head = &dsos__kernel; 265 head = &dsos__kernel;
269 266
270 dso = __dsos__findnew(head, filename); 267 dso = __dsos__findnew(head, filename);
271 if (dso != NULL) 268 if (dso != NULL) {
272 dso__set_build_id(dso, &bev.build_id); 269 dso__set_build_id(dso, &bev.build_id);
270 if (head == &dsos__kernel && filename[0] == '[')
271 dso->kernel = 1;
272 }
273 273
274 offset += bev.header.size; 274 offset += bev.header.size;
275 } 275 }