xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libperf: Move 'system_wide' from 'struct evsel' to 'struct perf_evsel'

Browse Source 
Move the 'system_wide 'member from perf's evsel to libperf's perf_evsel.

Committer notes:

Added stdbool.h as we now use bool here.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-20-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2019-08-06 11:35:19 +02:00
committed by Arnaldo Carvalho de Melo
parent 65aa2e6bae
commit 648b5af3f3
10 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/arch/x86/util/intel-pt.c
View File

@@ -422,7 +422,7 @@ static int intel_pt_track_switches(struct evlist *evlist)
perf_evsel__set_sample_bit(evsel, CPU); perf_evsel__set_sample_bit(evsel, CPU);
perf_evsel__set_sample_bit(evsel, TIME); perf_evsel__set_sample_bit(evsel, TIME);
evsel->system_wide = true; evsel->core.system_wide = true;
evsel->no_aux_samples = true; evsel->no_aux_samples = true;
evsel->immediate = true; evsel->immediate = true;
@@ -723,7 +723,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
switch_evsel->core.attr.sample_period = 1; switch_evsel->core.attr.sample_period = 1;
switch_evsel->core.attr.context_switch = 1; switch_evsel->core.attr.context_switch = 1;
switch_evsel->system_wide = true; switch_evsel->core.system_wide = true;
switch_evsel->no_aux_samples = true; switch_evsel->no_aux_samples = true;
switch_evsel->immediate = true; switch_evsel->immediate = true;

2
tools/perf/builtin-script.c
View File

@@ -1916,7 +1916,7 @@ static void __process_stat(struct evsel *counter, u64 tstamp)
int cpu, thread; int cpu, thread;
static int header_printed; static int header_printed;
if (counter->system_wide) if (counter->core.system_wide)
nthreads = 1; nthreads = 1;
if (!header_printed) { if (!header_printed) {

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

@@ -278,7 +278,7 @@ static int read_counter(struct evsel *counter, struct timespec *rs)
if (!counter->supported) if (!counter->supported)
return -ENOENT; return -ENOENT;
if (counter->system_wide) if (counter->core.system_wide)
nthreads = 1; nthreads = 1;
for (thread = 0; thread < nthreads; thread++) { for (thread = 0; thread < nthreads; thread++) {
@@ -1671,7 +1671,7 @@ static void setup_system_wide(int forks)
struct evsel *counter; struct evsel *counter;
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evsel_list, counter) {
if (!counter->system_wide) if (!counter->core.system_wide)
return; return;
} }

2
tools/perf/lib/include/internal/evsel.h
View File

@@ -4,6 +4,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <stdbool.h>
struct perf_cpu_map; struct perf_cpu_map;
struct perf_thread_map; struct perf_thread_map;
@@ -18,6 +19,7 @@ struct perf_evsel {
/* parse modifier helper */ /* parse modifier helper */
int nr_members; int nr_members;
bool system_wide;
}; };
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads); int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);

6
tools/perf/tests/switch-tracking.c
View File

@@ -144,7 +144,7 @@ static int process_sample_event(struct evlist *evlist,
return err; return err;
/* /*
* Check for no missing sched_switch events i.e. that the * Check for no missing sched_switch events i.e. that the
* evsel->system_wide flag has worked. * evsel->core.system_wide flag has worked.
*/ */
if (switch_tracking->tids[cpu] != -1 && if (switch_tracking->tids[cpu] != -1 &&
switch_tracking->tids[cpu] != prev_tid) { switch_tracking->tids[cpu] != prev_tid) {
@@ -316,7 +316,7 @@ out_free_nodes:
* *
* This function implements a test that checks that sched_switch events and * This function implements a test that checks that sched_switch events and
* tracking events can be recorded for a workload (current process) using the * tracking events can be recorded for a workload (current process) using the
* evsel->system_wide and evsel->tracking flags (respectively) with other events * evsel->core.system_wide and evsel->tracking flags (respectively) with other events
* sometimes enabled or disabled. * sometimes enabled or disabled.
*/ */
int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_unused) int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
@@ -396,7 +396,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
perf_evsel__set_sample_bit(switch_evsel, CPU); perf_evsel__set_sample_bit(switch_evsel, CPU);
perf_evsel__set_sample_bit(switch_evsel, TIME); perf_evsel__set_sample_bit(switch_evsel, TIME);
switch_evsel->system_wide = true; switch_evsel->core.system_wide = true;
switch_evsel->no_aux_samples = true; switch_evsel->no_aux_samples = true;
switch_evsel->immediate = true; switch_evsel->immediate = true;

10
tools/perf/util/evlist.c
View File

@@ -319,7 +319,7 @@ int perf_evlist__add_newtp(struct evlist *evlist,
static int perf_evlist__nr_threads(struct evlist *evlist, static int perf_evlist__nr_threads(struct evlist *evlist,
struct evsel *evsel) struct evsel *evsel)
{ {
if (evsel->system_wide) if (evsel->core.system_wide)
return 1; return 1;
else else
return perf_thread_map__nr(evlist->core.threads); return perf_thread_map__nr(evlist->core.threads);
@@ -410,7 +410,7 @@ int perf_evlist__alloc_pollfd(struct evlist *evlist)
struct evsel *evsel; struct evsel *evsel;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (evsel->system_wide) if (evsel->core.system_wide)
nfds += nr_cpus; nfds += nr_cpus;
else else
nfds += nr_cpus * nr_threads; nfds += nr_cpus * nr_threads;
@@ -536,7 +536,7 @@ static void perf_evlist__set_sid_idx(struct evlist *evlist,
sid->cpu = evlist->core.cpus->map[cpu]; sid->cpu = evlist->core.cpus->map[cpu];
else else
sid->cpu = -1; sid->cpu = -1;
if (!evsel->system_wide && evlist->core.threads && thread >= 0) if (!evsel->core.system_wide && evlist->core.threads && thread >= 0)
sid->tid = perf_thread_map__pid(evlist->core.threads, thread); sid->tid = perf_thread_map__pid(evlist->core.threads, thread);
else else
sid->tid = -1; sid->tid = -1;
@@ -763,7 +763,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx,
mp->prot &= ~PROT_WRITE; mp->prot &= ~PROT_WRITE;
} }
if (evsel->system_wide && thread) if (evsel->core.system_wide && thread)
continue; continue;
cpu = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu); cpu = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
@@ -793,7 +793,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx,
* other events, so it should not need to be polled anyway. * other events, so it should not need to be polled anyway.
* Therefore don't add it for polling. * Therefore don't add it for polling.
*/ */
if (!evsel->system_wide && if (!evsel->core.system_wide &&
__perf_evlist__add_pollfd(evlist, fd, &maps[idx], revent) < 0) { __perf_evlist__add_pollfd(evlist, fd, &maps[idx], revent) < 0) {
perf_mmap__put(&maps[idx]); perf_mmap__put(&maps[idx]);
return -1; return -1;

8
tools/perf/util/evsel.c
View File

@@ -1232,7 +1232,7 @@ int perf_evsel__alloc_id(struct evsel *evsel, int ncpus, int nthreads)
if (ncpus == 0 || nthreads == 0) if (ncpus == 0 || nthreads == 0)
return 0; return 0;
if (evsel->system_wide) if (evsel->core.system_wide)
nthreads = 1; nthreads = 1;
evsel->sample_id = xyarray__new(ncpus, nthreads, sizeof(struct perf_sample_id)); evsel->sample_id = xyarray__new(ncpus, nthreads, sizeof(struct perf_sample_id));
@@ -1663,7 +1663,7 @@ static bool ignore_missing_thread(struct evsel *evsel,
return false; return false;
/* The system wide setup does not work with threads. */ /* The system wide setup does not work with threads. */
if (evsel->system_wide) if (evsel->core.system_wide)
return false; return false;
/* The -ESRCH is perf event syscall errno for pid's not found. */ /* The -ESRCH is perf event syscall errno for pid's not found. */
@@ -1772,7 +1772,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,
threads = empty_thread_map; threads = empty_thread_map;
} }
if (evsel->system_wide) if (evsel->core.system_wide)
nthreads = 1; nthreads = 1;
else else
nthreads = threads->nr; nthreads = threads->nr;
@@ -1819,7 +1819,7 @@ retry_sample_id:
for (thread = 0; thread < nthreads; thread++) { for (thread = 0; thread < nthreads; thread++) {
int fd, group_fd; int fd, group_fd;
if (!evsel->cgrp && !evsel->system_wide) if (!evsel->cgrp && !evsel->core.system_wide)
pid = perf_thread_map__pid(threads, thread); pid = perf_thread_map__pid(threads, thread);
group_fd = get_group_fd(evsel, cpu, thread); group_fd = get_group_fd(evsel, cpu, thread);

1
tools/perf/util/evsel.h
View File

@@ -146,7 +146,6 @@ struct evsel {
bool disabled; bool disabled;
bool no_aux_samples; bool no_aux_samples;
bool immediate; bool immediate;
bool system_wide;
bool tracking; bool tracking;
bool per_pkg; bool per_pkg;
bool precise_max; bool precise_max;

2
tools/perf/util/parse-events.c
View File

@@ -335,7 +335,7 @@ __add_event(struct list_head *list, int *idx,
(*idx)++; (*idx)++;
evsel->core.cpus = perf_cpu_map__get(cpus); evsel->core.cpus = perf_cpu_map__get(cpus);
evsel->core.own_cpus = perf_cpu_map__get(cpus); evsel->core.own_cpus = perf_cpu_map__get(cpus);
evsel->system_wide = pmu ? pmu->is_uncore : false; evsel->core.system_wide = pmu ? pmu->is_uncore : false;
evsel->auto_merge_stats = auto_merge_stats; evsel->auto_merge_stats = auto_merge_stats;
if (name) if (name)

2
tools/perf/util/stat.c
View File

@@ -336,7 +336,7 @@ static int process_counter_maps(struct perf_stat_config *config,
int ncpus = perf_evsel__nr_cpus(counter); int ncpus = perf_evsel__nr_cpus(counter);
int cpu, thread; int cpu, thread;
if (counter->system_wide) if (counter->core.system_wide)
nthreads = 1; nthreads = 1;
for (thread = 0; thread < nthreads; thread++) { for (thread = 0; thread < nthreads; thread++) {