diff options
| author | Masami Hiramatsu | 2015-12-09 03:11:33 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2015-12-09 17:42:00 +0100 |
| commit | cc1121ab9687d660cc02f50b1a4974112f87a8e6 (patch) | |
| tree | 05c4bf982d132ad6834f2b31ca0a2dc334cc3f12 /tools/perf/util/machine.c | |
| parent | perf tools: Fix maps__fixup_overlappings to put used maps (diff) | |
| download | kernel-qcow2-linux-cc1121ab9687d660cc02f50b1a4974112f87a8e6.tar.gz kernel-qcow2-linux-cc1121ab9687d660cc02f50b1a4974112f87a8e6.tar.xz kernel-qcow2-linux-cc1121ab9687d660cc02f50b1a4974112f87a8e6.zip | |
perf machine: Fix machine.vmlinux_maps to make sure to clear the old one
Fix machine.vmlinux_maps to make sure to clear the old one if it is
renewal. This can leak the previous maps on the vmlinux_maps because
those are just overwritten.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20151209021133.10245.93730.stgit@localhost.localdomain
[ Simplified the memset, same end result ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index bfc289c73c22..f5882b8c8db9 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -44,6 +44,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) machine->comm_exec = false; machine->kernel_start = 0; + memset(machine->vmlinux_maps, 0, sizeof(machine->vmlinux_maps)); + machine->root_dir = strdup(root_dir); if (machine->root_dir == NULL) return -ENOMEM; @@ -770,6 +772,9 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel) enum map_type type; u64 start = machine__get_running_kernel_start(machine, NULL); + /* In case of renewal the kernel map, destroy previous one */ + machine__destroy_kernel_maps(machine); + for (type = 0; type < MAP__NR_TYPES; ++type) { struct kmap *kmap; struct map *map; |