perf machine: Introduce synthesize_threads method out of open coded equivalent

Further simplifications to be done on following patch, as most tools
don't use the callback, using instead just the canned
machine__process_event one.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-r1m0vuuj3cat4bampno9yc8d@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index f36e8209c300b86d137ed8869019f7eb629aa2dc..f5d2c4bccbec57a179f35a56ba1ed8935ad53a7a 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1544,18 +1544,9 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
        }
        kvm->session->evlist = kvm->evlist;
        perf_session__set_id_hdr_size(kvm->session);
-
-
-       if (perf_target__has_task(&kvm->opts.target))
-               perf_event__synthesize_thread_map(&kvm->tool,
-                                                 kvm->evlist->threads,
-                                                 perf_event__process,
-                                                 &kvm->session->machines.host, false);
-       else
-               perf_event__synthesize_threads(&kvm->tool, perf_event__process,
-                                              &kvm->session->machines.host, false);
-
-
+       machine__synthesize_threads(&kvm->session->machines.host, &kvm->tool,
+                                   &kvm->opts.target, kvm->evlist->threads,
+                                   perf_event__process, false);
        err = kvm_live_open_events(kvm);
        if (err)
                goto out;

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index afb252cf6ecad295f3a5d4098beaf6e247f91489..41d1f37f53484e4f74709b4676b93cfff480ebc7 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -480,16 +480,8 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
                                         perf_event__synthesize_guest_os, tool);
        }
 
-       if (perf_target__has_task(&opts->target))
-               err = perf_event__synthesize_thread_map(tool, evsel_list->threads,
-                                                       process_synthesized_event,
-                                                       machine, opts->sample_address);
-       else if (perf_target__has_cpu(&opts->target))
-               err = perf_event__synthesize_threads(tool, process_synthesized_event,
-                                                    machine, opts->sample_address);
-       else /* command specified */
-               err = 0;
-
+       err = machine__synthesize_threads(machine, tool, &opts->target, evsel_list->threads,
+                                         process_synthesized_event, opts->sample_address);
        if (err != 0)
                goto out_delete_session;
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index cc96d753db96cd6ad0cfa992140e649e0276e3d8..c3a936ef76885d24e26e4ce8c0704f96943df143 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -950,14 +950,9 @@ static int __cmd_top(struct perf_top *top)
        if (ret)
                goto out_delete;
 
-       if (perf_target__has_task(&opts->target))
-               perf_event__synthesize_thread_map(&top->tool, top->evlist->threads,
-                                                 perf_event__process,
-                                                 &top->session->machines.host, false);
-       else
-               perf_event__synthesize_threads(&top->tool, perf_event__process,
-                                              &top->session->machines.host, false);
-
+       machine__synthesize_threads(&top->session->machines.host, &top->tool,
+                                   &opts->target, top->evlist->threads,
+                                   perf_event__process, false);
        ret = perf_top__start_counters(top);
        if (ret)
                goto out_delete;

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 277c2367e0cf122733939c790c2b424dcb80b80f..7690324824db6b19c5ec60823be608d8a6bfc52d 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1340,15 +1340,8 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist)
        if (trace->host == NULL)
                return -ENOMEM;
 
-       if (perf_target__has_task(&trace->opts.target)) {
-               err = perf_event__synthesize_thread_map(&trace->tool, evlist->threads,
-                                                       trace__tool_process,
-                                                       trace->host, false);
-       } else {
-               err = perf_event__synthesize_threads(&trace->tool, trace__tool_process,
-                                                    trace->host, false);
-       }
-
+       err = machine__synthesize_threads(trace->host, &trace->tool, &trace->opts.target,
+                                         evlist->threads, trace__tool_process, false);
        if (err)
                symbol__exit();
 

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ce034c183a7ede78535ee8f11d13a18b2fe6617f..9f2c61d5a9ed625018d98f281be3aa25ef34cc3e 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1394,3 +1394,15 @@ int machine__for_each_thread(struct machine *machine,
        }
        return rc;
 }
+
+int machine__synthesize_threads(struct machine *machine, struct perf_tool *tool,
+                               struct perf_target *target, struct thread_map *threads,
+                               perf_event__handler_t process, bool data_mmap)
+{
+       if (perf_target__has_task(target))
+               return perf_event__synthesize_thread_map(tool, threads, process, machine, data_mmap);
+       else if (perf_target__has_cpu(target))
+               return perf_event__synthesize_threads(tool, process, machine, data_mmap);
+       /* command specified */
+       return 0;
+}

diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 2389ba81fafedf018be283e6aea14295d610613e..14a89d2aecaf266fc685e1d87e0243f13c9a9e5a 100644 (file)
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include <linux/rbtree.h>
 #include "map.h"
+#include "event.h"
 
 struct addr_location;
 struct branch_stack;
@@ -178,4 +179,7 @@ int machine__for_each_thread(struct machine *machine,
                             int (*fn)(struct thread *thread, void *p),
                             void *priv);
 
+int machine__synthesize_threads(struct machine *machine, struct perf_tool *tool,
+                               struct perf_target *target, struct thread_map *threads,
+                               perf_event__handler_t process, bool data_mmap);
 #endif /* __PERF_MACHINE_H */