perf machine: Generalize machine__set_kernel_mmap()
authorJiri Olsa <jolsa@kernel.org>
Thu, 15 Feb 2018 12:26:31 +0000 (13:26 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 16 Feb 2018 17:25:57 +0000 (14:25 -0300)
So it could be called without event object, just with start and end
values. It will be used in following patch.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180215122635.24029-6-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/machine.c

index b1f1961b13f4f55a58bbfcc68a30fe4baa46f6ab..292e70c774bd0d4086bac1060be37941062d65a1 100644 (file)
@@ -1262,15 +1262,15 @@ int machine__create_kernel_maps(struct machine *machine)
        return 0;
 }
 
-static void machine__set_kernel_mmap_len(struct machine *machine,
-                                        union perf_event *event)
+static void machine__set_kernel_mmap(struct machine *machine,
+                                    u64 start, u64 end)
 {
        int i;
 
        for (i = 0; i < MAP__NR_TYPES; i++) {
-               machine->vmlinux_maps[i]->start = event->mmap.start;
-               machine->vmlinux_maps[i]->end   = (event->mmap.start +
-                                                  event->mmap.len);
+               machine->vmlinux_maps[i]->start = start;
+               machine->vmlinux_maps[i]->end   = end;
+
                /*
                 * Be a bit paranoid here, some perf.data file came with
                 * a zero sized synthesized MMAP event for the kernel.
@@ -1375,7 +1375,8 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
                if (strstr(kernel->long_name, "vmlinux"))
                        dso__set_short_name(kernel, "[kernel.vmlinux]", false);
 
-               machine__set_kernel_mmap_len(machine, event);
+               machine__set_kernel_mmap(machine, event->mmap.start,
+                                        event->mmap.start + event->mmap.len);
 
                /*
                 * Avoid using a zero address (kptr_restrict) for the ref reloc