leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf machine: Simplify synthesize_threads method

Browse Source 
Several tools (top, kvm) don't need to be called back to process each of
the syntheiszed records, instead relying on the machine__process_event
function to change the per machine data structures that represent
threads and mmaps, so provide a way to ask for this common idiom.

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-pusqibp8n3c4ynegd1frn4zd@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-11-11 11:36:12 -03:00
parent 58d925dced
commit a33fbd56ec
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/builtin-kvm.c
View File

@ -1544,9 +1544,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
}
kvm->session->evlist = kvm->evlist;
perf_session__set_id_hdr_size(kvm->session);
machine__synthesize_threads(&kvm->session->machines.host, &kvm->tool,
&kvm->opts.target, kvm->evlist->threads,
perf_event__process, false);
machine__synthesize_threads(&kvm->session->machines.host, &kvm->opts.target,
kvm->evlist->threads, false);
err = kvm_live_open_events(kvm);
if (err)
goto out;

4
tools/perf/builtin-record.c
View File

@ -480,8 +480,8 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
perf_event__synthesize_guest_os, tool);
}
err = machine__synthesize_threads(machine, tool, &opts->target, evsel_list->threads,
process_synthesized_event, opts->sample_address);
err = __machine__synthesize_threads(machine, tool, &opts->target, evsel_list->threads,
process_synthesized_event, opts->sample_address);
if (err != 0)
goto out_delete_session;

5
tools/perf/builtin-top.c
View File

@ -950,9 +950,8 @@ static int __cmd_top(struct perf_top *top)
if (ret)
goto out_delete;
machine__synthesize_threads(&top->session->machines.host, &top->tool,
&opts->target, top->evlist->threads,
perf_event__process, false);
machine__synthesize_threads(&top->session->machines.host, &opts->target,
top->evlist->threads, false);
ret = perf_top__start_counters(top);
if (ret)
goto out_delete;

4
tools/perf/builtin-trace.c
View File

@ -1340,8 +1340,8 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist)
if (trace->host == NULL)
return -ENOMEM;
err = machine__synthesize_threads(trace->host, &trace->tool, &trace->opts.target,
evlist->threads, trace__tool_process, false);
err = __machine__synthesize_threads(trace->host, &trace->tool, &trace->opts.target,
evlist->threads, trace__tool_process, false);
if (err)
symbol__exit();

6
tools/perf/util/machine.c
View File

@ -1395,9 +1395,9 @@ 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)
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);

14
tools/perf/util/machine.h
View File

@ -179,7 +179,15 @@ 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);
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);
static inline
int machine__synthesize_threads(struct machine *machine, struct perf_target *target,
struct thread_map *threads, bool data_mmap)
{
return __machine__synthesize_threads(machine, NULL, target, threads,
perf_event__process, data_mmap);
}
#endif /* __PERF_MACHINE_H */