perf machine: Factor out machines__find_guest()

Factor out machines__find_guest() so it can be re-used.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210218095801.19576-6-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ab8a6b3..90703b7 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -369,6 +369,15 @@ out:
        return machine;
 }
 
+struct machine *machines__find_guest(struct machines *machines, pid_t pid)
+{
+       struct machine *machine = machines__find(machines, pid);
+
+       if (!machine)
+               machine = machines__findnew(machines, DEFAULT_GUEST_KERNEL_ID);
+       return machine;
+}
+
 void machines__process_guests(struct machines *machines,
                              machine__process_t process, void *data)
 {

diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 26368d3..022c19e 100644 (file)
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -162,6 +162,7 @@ struct machine *machines__add(struct machines *machines, pid_t pid,
 struct machine *machines__find_host(struct machines *machines);
 struct machine *machines__find(struct machines *machines, pid_t pid);
 struct machine *machines__findnew(struct machines *machines, pid_t pid);
+struct machine *machines__find_guest(struct machines *machines, pid_t pid);
 
 void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size);
 void machines__set_comm_exec(struct machines *machines, bool comm_exec);

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index f4aeb1a..7b0d0c9 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1356,8 +1356,6 @@ static struct machine *machines__find_for_cpumode(struct machines *machines,
                                               union perf_event *event,
                                               struct perf_sample *sample)
 {
-       struct machine *machine;
-
        if (perf_guest &&
            ((sample->cpumode == PERF_RECORD_MISC_GUEST_KERNEL) ||
             (sample->cpumode == PERF_RECORD_MISC_GUEST_USER))) {
@@ -1369,10 +1367,7 @@ static struct machine *machines__find_for_cpumode(struct machines *machines,
                else
                        pid = sample->pid;
 
-               machine = machines__find(machines, pid);
-               if (!machine)
-                       machine = machines__findnew(machines, DEFAULT_GUEST_KERNEL_ID);
-               return machine;
+               return machines__find_guest(machines, pid);
        }
 
        return &machines->host;