Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf evsel: Rename *perf_evsel__read*() to *evsel__read()

Browse Source 
As those are 'struct evsel' methods, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2020-04-30 11:00:53 -03:00
parent 53fcfa6b8e
commit ea08969273
6 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,7 @@ static int read_single_counter(struct evsel *counter, int cpu,
count->val = val; count->val = val;
return 0; return 0;
} }
return perf_evsel__read_counter(counter, cpu, thread); return evsel__read_counter(counter, cpu, thread);
} }
/* /*
@ -284,7 +284,7 @@ static int read_counter_cpu(struct evsel *counter, struct timespec *rs, int cpu)
/* /*
* The leader's group read loads data into its group members * The leader's group read loads data into its group members
* (via perf_evsel__read_counter()) and sets their count->loaded. * (via evsel__read_counter()) and sets their count->loaded.
*/ */
if (!perf_counts__is_loaded(counter->counts, cpu, thread) && if (!perf_counts__is_loaded(counter->counts, cpu, thread) &&
read_single_counter(counter, cpu, thread, rs)) { read_single_counter(counter, cpu, thread, rs)) {

6
tools/perf/tests/openat-syscall-all-cpus.c
View File

@ -103,15 +103,15 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int
if (cpus->map[cpu] >= CPU_SETSIZE) if (cpus->map[cpu] >= CPU_SETSIZE)
continue; continue;
if (perf_evsel__read_on_cpu(evsel, cpu, 0) < 0) { if (evsel__read_on_cpu(evsel, cpu, 0) < 0) {
pr_debug("perf_evsel__read_on_cpu\n"); pr_debug("evsel__read_on_cpu\n");
err = -1; err = -1;
break; break;
} }
expected = nr_openat_calls + cpu; expected = nr_openat_calls + cpu;
if (perf_counts(evsel->counts, cpu, 0)->val != expected) { if (perf_counts(evsel->counts, cpu, 0)->val != expected) {
pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n", pr_debug("evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n",
expected, cpus->map[cpu], perf_counts(evsel->counts, cpu, 0)->val); expected, cpus->map[cpu], perf_counts(evsel->counts, cpu, 0)->val);
err = -1; err = -1;
} }

6
tools/perf/tests/openat-syscall.c
View File

@ -46,13 +46,13 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __m
close(fd); close(fd);
} }
if (perf_evsel__read_on_cpu(evsel, 0, 0) < 0) { if (evsel__read_on_cpu(evsel, 0, 0) < 0) {
pr_debug("perf_evsel__read_on_cpu\n"); pr_debug("evsel__read_on_cpu\n");
goto out_close_fd; goto out_close_fd;
} }
if (perf_counts(evsel->counts, 0, 0)->val != nr_openat_calls) { if (perf_counts(evsel->counts, 0, 0)->val != nr_openat_calls) {
pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n", pr_debug("evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n",
nr_openat_calls, perf_counts(evsel->counts, 0, 0)->val); nr_openat_calls, perf_counts(evsel->counts, 0, 0)->val);
goto out_close_fd; goto out_close_fd;
} }

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

@ -1317,8 +1317,7 @@ void perf_counts_values__scale(struct perf_counts_values *count,
*pscaled = scaled; *pscaled = scaled;
} }
static int static int evsel__read_one(struct evsel *evsel, int cpu, int thread)
perf_evsel__read_one(struct evsel *evsel, int cpu, int thread)
{ {
struct perf_counts_values *count = perf_counts(evsel->counts, cpu, thread); struct perf_counts_values *count = perf_counts(evsel->counts, cpu, thread);
@ -1378,8 +1377,7 @@ perf_evsel__process_group_data(struct evsel *leader,
return 0; return 0;
} }
static int static int evsel__read_group(struct evsel *leader, int cpu, int thread)
perf_evsel__read_group(struct evsel *leader, int cpu, int thread)
{ {
struct perf_stat_evsel *ps = leader->stats; struct perf_stat_evsel *ps = leader->stats;
u64 read_format = leader->core.attr.read_format; u64 read_format = leader->core.attr.read_format;
@ -1409,18 +1407,17 @@ perf_evsel__read_group(struct evsel *leader, int cpu, int thread)
return perf_evsel__process_group_data(leader, cpu, thread, data); return perf_evsel__process_group_data(leader, cpu, thread, data);
} }
int perf_evsel__read_counter(struct evsel *evsel, int cpu, int thread) int evsel__read_counter(struct evsel *evsel, int cpu, int thread)
{ {
u64 read_format = evsel->core.attr.read_format; u64 read_format = evsel->core.attr.read_format;
if (read_format & PERF_FORMAT_GROUP) if (read_format & PERF_FORMAT_GROUP)
return perf_evsel__read_group(evsel, cpu, thread); return evsel__read_group(evsel, cpu, thread);
else
return perf_evsel__read_one(evsel, cpu, thread); return evsel__read_one(evsel, cpu, thread);
} }
int __perf_evsel__read_on_cpu(struct evsel *evsel, int __evsel__read_on_cpu(struct evsel *evsel, int cpu, int thread, bool scale)
int cpu, int thread, bool scale)
{ {
struct perf_counts_values count; struct perf_counts_values count;
size_t nv = scale ? 3 : 1; size_t nv = scale ? 3 : 1;

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

@ -265,35 +265,32 @@ static inline bool evsel__match2(struct evsel *e1, struct evsel *e2)
(e1->core.attr.config == e2->core.attr.config); (e1->core.attr.config == e2->core.attr.config);
} }
int perf_evsel__read_counter(struct evsel *evsel, int cpu, int thread); int evsel__read_counter(struct evsel *evsel, int cpu, int thread);
int __perf_evsel__read_on_cpu(struct evsel *evsel, int __evsel__read_on_cpu(struct evsel *evsel, int cpu, int thread, bool scale);
int cpu, int thread, bool scale);
/** /**
* perf_evsel__read_on_cpu - Read out the results on a CPU and thread * evsel__read_on_cpu - Read out the results on a CPU and thread
* *
* @evsel - event selector to read value * @evsel - event selector to read value
* @cpu - CPU of interest * @cpu - CPU of interest
* @thread - thread of interest * @thread - thread of interest
*/ */
static inline int perf_evsel__read_on_cpu(struct evsel *evsel, static inline int evsel__read_on_cpu(struct evsel *evsel, int cpu, int thread)
int cpu, int thread)
{ {
return __perf_evsel__read_on_cpu(evsel, cpu, thread, false); return __evsel__read_on_cpu(evsel, cpu, thread, false);
} }
/** /**
* perf_evsel__read_on_cpu_scaled - Read out the results on a CPU and thread, scaled * evsel__read_on_cpu_scaled - Read out the results on a CPU and thread, scaled
* *
* @evsel - event selector to read value * @evsel - event selector to read value
* @cpu - CPU of interest * @cpu - CPU of interest
* @thread - thread of interest * @thread - thread of interest
*/ */
static inline int perf_evsel__read_on_cpu_scaled(struct evsel *evsel, static inline int evsel__read_on_cpu_scaled(struct evsel *evsel, int cpu, int thread)
int cpu, int thread)
{ {
return __perf_evsel__read_on_cpu(evsel, cpu, thread, true); return __evsel__read_on_cpu(evsel, cpu, thread, true);
} }
int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event, int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event,

5
tools/perf/util/record.c
View File

@ -19,8 +19,7 @@
* However, if the leader is an AUX area event, then assume the event to sample * However, if the leader is an AUX area event, then assume the event to sample
* is the next event. * is the next event.
*/ */
static struct evsel *perf_evsel__read_sampler(struct evsel *evsel, static struct evsel *evsel__read_sampler(struct evsel *evsel, struct evlist *evlist)
struct evlist *evlist)
{ {
struct evsel *leader = evsel->leader; struct evsel *leader = evsel->leader;
@ -43,7 +42,7 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *ev
if (!leader->sample_read) if (!leader->sample_read)
return; return;
read_sampler = perf_evsel__read_sampler(evsel, evlist); read_sampler = evsel__read_sampler(evsel, evlist);
if (evsel == read_sampler) if (evsel == read_sampler)
return; return;