perf evsel: Allow specifying if the inherit bit should be set
As this is a per-cpu attribute, we can't set it up in advance and use it for all the calls. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
@@ -128,7 +128,7 @@ int __perf_evsel__read(struct perf_evsel *evsel,
|
||||
}
|
||||
|
||||
static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
int cpu, thread;
|
||||
|
||||
@@ -139,6 +139,8 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
for (cpu = 0; cpu < cpus->nr; cpu++) {
|
||||
int group_fd = -1;
|
||||
|
||||
evsel->attr.inherit = (cpus->map[cpu] < 0) && inherit;
|
||||
|
||||
for (thread = 0; thread < threads->nr; thread++) {
|
||||
FD(evsel, cpu, thread) = sys_perf_event_open(&evsel->attr,
|
||||
threads->map[thread],
|
||||
@@ -182,7 +184,7 @@ static struct {
|
||||
};
|
||||
|
||||
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
if (cpus == NULL) {
|
||||
/* Work around old compiler warnings about strict aliasing */
|
||||
@@ -192,17 +194,17 @@ int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
if (threads == NULL)
|
||||
threads = &empty_thread_map.map;
|
||||
|
||||
return __perf_evsel__open(evsel, cpus, threads, group);
|
||||
return __perf_evsel__open(evsel, cpus, threads, group, inherit);
|
||||
}
|
||||
|
||||
int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
|
||||
struct cpu_map *cpus, bool group)
|
||||
struct cpu_map *cpus, bool group, bool inherit)
|
||||
{
|
||||
return __perf_evsel__open(evsel, cpus, &empty_thread_map.map, group);
|
||||
return __perf_evsel__open(evsel, cpus, &empty_thread_map.map, group, inherit);
|
||||
}
|
||||
|
||||
int perf_evsel__open_per_thread(struct perf_evsel *evsel,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
return __perf_evsel__open(evsel, &empty_cpu_map.map, threads, group);
|
||||
return __perf_evsel__open(evsel, &empty_cpu_map.map, threads, group, inherit);
|
||||
}
|
||||
|
Reference in New Issue
Block a user