renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

perf evlist: Use the right prefix for 'struct evlist' sample id lookup methods

Browse Source 
perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.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-11-30 14:17:57 -03:00
parent fd643db5a8
commit 3ccf8a7b66
18 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2224,7 +2224,7 @@ static int print_event_with_time(struct perf_tool *tool,
{ {
struct perf_script *script = container_of(tool, struct perf_script, tool); struct perf_script *script = container_of(tool, struct perf_script, tool);
struct perf_session *session = script->session; struct perf_session *session = script->session;
struct evsel *evsel = perf_evlist__id2evsel(session->evlist, sample->id); struct evsel *evsel = evlist__id2evsel(session->evlist, sample->id);
struct thread *thread = NULL; struct thread *thread = NULL;
if (evsel && !evsel->core.attr.sample_id_all) { if (evsel && !evsel->core.attr.sample_id_all) {

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

@ -1159,7 +1159,7 @@ static int deliver_event(struct ordered_events *qe,
goto next_event; goto next_event;
} }
evsel = perf_evlist__id2evsel(session->evlist, sample.id); evsel = evlist__id2evsel(session->evlist, sample.id);
assert(evsel != NULL); assert(evsel != NULL);
if (event->header.type == PERF_RECORD_SAMPLE) { if (event->header.type == PERF_RECORD_SAMPLE) {

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

@ -3105,7 +3105,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st
return; return;
} }
evsel = perf_evlist__id2evsel(trace->evlist, sample->id); evsel = evlist__id2evsel(trace->evlist, sample->id);
if (evsel == NULL) { if (evsel == NULL) {
fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample->id); fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample->id);
return; return;

2
tools/perf/tests/mmap-basic.c
View File

@ -133,7 +133,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
} }
err = -1; err = -1;
evsel = perf_evlist__id2evsel(evlist, sample.id); evsel = evlist__id2evsel(evlist, sample.id);
if (evsel == NULL) { if (evsel == NULL) {
pr_debug("event with id %" PRIu64 pr_debug("event with id %" PRIu64
" doesn't map to an evsel\n", sample.id); " doesn't map to an evsel\n", sample.id);

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

@ -133,7 +133,7 @@ static int process_sample_event(struct evlist *evlist,
return -1; return -1;
} }
evsel = perf_evlist__id2evsel(evlist, sample.id); evsel = evlist__id2evsel(evlist, sample.id);
if (evsel == switch_tracking->switch_evsel) { if (evsel == switch_tracking->switch_evsel) {
next_tid = evsel__intval(evsel, &sample, "next_pid"); next_tid = evsel__intval(evsel, &sample, "next_pid");
prev_tid = evsel__intval(evsel, &sample, "prev_pid"); prev_tid = evsel__intval(evsel, &sample, "prev_pid");

4
tools/perf/util/auxtrace.c
View File

@ -1017,7 +1017,7 @@ struct auxtrace_queue *auxtrace_queues__sample_queue(struct auxtrace_queues *que
if (!id) if (!id)
return NULL; return NULL;
sid = perf_evlist__id2sid(session->evlist, id); sid = evlist__id2sid(session->evlist, id);
if (!sid) if (!sid)
return NULL; return NULL;
@ -1047,7 +1047,7 @@ int auxtrace_queues__add_sample(struct auxtrace_queues *queues,
if (!id) if (!id)
return -EINVAL; return -EINVAL;
sid = perf_evlist__id2sid(session->evlist, id); sid = evlist__id2sid(session->evlist, id);
if (!sid) if (!sid)
return -ENOENT; return -ENOENT;

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

@ -509,7 +509,7 @@ int evlist__poll(struct evlist *evlist, int timeout)
return perf_evlist__poll(&evlist->core, timeout); return perf_evlist__poll(&evlist->core, timeout);
} }
struct perf_sample_id *perf_evlist__id2sid(struct evlist *evlist, u64 id) struct perf_sample_id *evlist__id2sid(struct evlist *evlist, u64 id)
{ {
struct hlist_head *head; struct hlist_head *head;
struct perf_sample_id *sid; struct perf_sample_id *sid;
@ -525,14 +525,14 @@ struct perf_sample_id *perf_evlist__id2sid(struct evlist *evlist, u64 id)
return NULL; return NULL;
} }
struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id) struct evsel *evlist__id2evsel(struct evlist *evlist, u64 id)
{ {
struct perf_sample_id *sid; struct perf_sample_id *sid;
if (evlist->core.nr_entries == 1 || !id) if (evlist->core.nr_entries == 1 || !id)
return evlist__first(evlist); return evlist__first(evlist);
sid = perf_evlist__id2sid(evlist, id); sid = evlist__id2sid(evlist, id);
if (sid) if (sid)
return container_of(sid->evsel, struct evsel, core); return container_of(sid->evsel, struct evsel, core);
@ -542,23 +542,21 @@ struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id)
return NULL; return NULL;
} }
struct evsel *perf_evlist__id2evsel_strict(struct evlist *evlist, struct evsel *evlist__id2evsel_strict(struct evlist *evlist, u64 id)
u64 id)
{ {
struct perf_sample_id *sid; struct perf_sample_id *sid;
if (!id) if (!id)
return NULL; return NULL;
sid = perf_evlist__id2sid(evlist, id); sid = evlist__id2sid(evlist, id);
if (sid) if (sid)
return container_of(sid->evsel, struct evsel, core); return container_of(sid->evsel, struct evsel, core);
return NULL; return NULL;
} }
static int perf_evlist__event2id(struct evlist *evlist, static int evlist__event2id(struct evlist *evlist, union perf_event *event, u64 *id)
union perf_event *event, u64 *id)
{ {
const __u64 *array = event->sample.array; const __u64 *array = event->sample.array;
ssize_t n; ssize_t n;
@ -578,8 +576,7 @@ static int perf_evlist__event2id(struct evlist *evlist,
return 0; return 0;
} }
struct evsel *perf_evlist__event2evsel(struct evlist *evlist, struct evsel *evlist__event2evsel(struct evlist *evlist, union perf_event *event)
union perf_event *event)
{ {
struct evsel *first = evlist__first(evlist); struct evsel *first = evlist__first(evlist);
struct hlist_head *head; struct hlist_head *head;
@ -594,7 +591,7 @@ struct evsel *perf_evlist__event2evsel(struct evlist *evlist,
event->header.type != PERF_RECORD_SAMPLE) event->header.type != PERF_RECORD_SAMPLE)
return first; return first;
if (perf_evlist__event2id(evlist, event, &id)) if (evlist__event2id(evlist, event, &id))
return NULL; return NULL;
/* Synthesized events have an id of zero */ /* Synthesized events have an id of zero */
@ -1427,7 +1424,7 @@ int evlist__start_workload(struct evlist *evlist)
int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample) int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
{ {
struct evsel *evsel = perf_evlist__event2evsel(evlist, event); struct evsel *evsel = evlist__event2evsel(evlist, event);
if (!evsel) if (!evsel)
return -EFAULT; return -EFAULT;
@ -1436,7 +1433,7 @@ int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct
int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp) int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp)
{ {
struct evsel *evsel = perf_evlist__event2evsel(evlist, event); struct evsel *evsel = evlist__event2evsel(evlist, event);
if (!evsel) if (!evsel)
return -EFAULT; return -EFAULT;

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

@ -144,11 +144,10 @@ int evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask);
int evlist__poll(struct evlist *evlist, int timeout); int evlist__poll(struct evlist *evlist, int timeout);
struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id); struct evsel *evlist__id2evsel(struct evlist *evlist, u64 id);
struct evsel *perf_evlist__id2evsel_strict(struct evlist *evlist, struct evsel *evlist__id2evsel_strict(struct evlist *evlist, u64 id);
u64 id);
struct perf_sample_id *perf_evlist__id2sid(struct evlist *evlist, u64 id); struct perf_sample_id *evlist__id2sid(struct evlist *evlist, u64 id);
void evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state state); void evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state state);
@ -325,8 +324,7 @@ bool evsel__cpu_iter_skip_no_inc(struct evsel *ev, int cpu);
struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str); struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str);
struct evsel *perf_evlist__event2evsel(struct evlist *evlist, struct evsel *evlist__event2evsel(struct evlist *evlist, union perf_event *event);
union perf_event *event);
bool perf_evlist__exclude_kernel(struct evlist *evlist); bool perf_evlist__exclude_kernel(struct evlist *evlist);

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

@ -1469,7 +1469,7 @@ static int evsel__process_group_data(struct evsel *leader, int cpu, int thread,
for (i = 1; i < nr; i++) { for (i = 1; i < nr; i++) {
struct evsel *counter; struct evsel *counter;
counter = perf_evlist__id2evsel(leader->evlist, v[i].id); counter = evlist__id2evsel(leader->evlist, v[i].id);
if (!counter) if (!counter)
return -EINVAL; return -EINVAL;

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

@ -4030,7 +4030,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
evlist = *pevlist; evlist = *pevlist;
evsel = perf_evlist__id2evsel(evlist, ev->id); evsel = evlist__id2evsel(evlist, ev->id);
if (evsel == NULL) if (evsel == NULL)
return -EINVAL; return -EINVAL;

3
tools/perf/util/intel-pt.c
View File

@ -2520,11 +2520,10 @@ static int intel_pt_sync_switch(struct intel_pt *pt, int cpu, pid_t tid,
static int intel_pt_process_switch(struct intel_pt *pt, static int intel_pt_process_switch(struct intel_pt *pt,
struct perf_sample *sample) struct perf_sample *sample)
{ {
struct evsel *evsel;
pid_t tid; pid_t tid;
int cpu, ret; int cpu, ret;
struct evsel *evsel = evlist__id2evsel(pt->session->evlist, sample->id);
evsel = perf_evlist__id2evsel(pt->session->evlist, sample->id);
if (evsel != pt->switch_evsel) if (evsel != pt->switch_evsel)
return 0; return 0;

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

@ -1055,7 +1055,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
if (pyevent == NULL) if (pyevent == NULL)
return PyErr_NoMemory(); return PyErr_NoMemory();
evsel = perf_evlist__event2evsel(evlist, event); evsel = evlist__event2evsel(evlist, event);
if (!evsel) { if (!evsel) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;

2
tools/perf/util/s390-cpumsf.c
View File

@ -932,7 +932,7 @@ s390_cpumsf_process_event(struct perf_session *session,
if (event->header.type == PERF_RECORD_SAMPLE && if (event->header.type == PERF_RECORD_SAMPLE &&
sample->raw_size) { sample->raw_size) {
/* Handle event with raw data */ /* Handle event with raw data */
ev_bc000 = perf_evlist__event2evsel(session->evlist, event); ev_bc000 = evlist__event2evsel(session->evlist, event);
if (ev_bc000 && if (ev_bc000 &&
ev_bc000->core.attr.config == PERF_EVENT_CPUM_CF_DIAG) ev_bc000->core.attr.config == PERF_EVENT_CPUM_CF_DIAG)
err = s390_cpumcf_dumpctr(sf, sample); err = s390_cpumcf_dumpctr(sf, sample);

2
tools/perf/util/s390-sample-raw.c
View File

@ -205,7 +205,7 @@ void perf_evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event
if (event->header.type != PERF_RECORD_SAMPLE) if (event->header.type != PERF_RECORD_SAMPLE)
return; return;
ev_bc000 = perf_evlist__event2evsel(evlist, event); ev_bc000 = evlist__event2evsel(evlist, event);
if (ev_bc000 == NULL || if (ev_bc000 == NULL ||
ev_bc000->core.attr.config != PERF_EVENT_CPUM_CF_DIAG) ev_bc000->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
return; return;

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

@ -1364,7 +1364,7 @@ static int deliver_sample_value(struct evlist *evlist,
struct sample_read_value *v, struct sample_read_value *v,
struct machine *machine) struct machine *machine)
{ {
struct perf_sample_id *sid = perf_evlist__id2sid(evlist, v->id); struct perf_sample_id *sid = evlist__id2sid(evlist, v->id);
struct evsel *evsel; struct evsel *evsel;
if (sid) { if (sid) {
@ -1445,7 +1445,7 @@ static int machines__deliver_event(struct machines *machines,
dump_event(evlist, event, file_offset, sample); dump_event(evlist, event, file_offset, sample);
evsel = perf_evlist__id2evsel(evlist, sample->id); evsel = evlist__id2evsel(evlist, sample->id);
machine = machines__find_for_cpumode(machines, event, sample); machine = machines__find_for_cpumode(machines, event, sample);
@ -2476,7 +2476,7 @@ int perf_event__process_id_index(struct perf_session *session,
fprintf(stdout, " tid: %"PRI_ld64"\n", e->tid); fprintf(stdout, " tid: %"PRI_ld64"\n", e->tid);
} }
sid = perf_evlist__id2sid(evlist, e->id); sid = evlist__id2sid(evlist, e->id);
if (!sid) if (!sid)
return -ENOENT; return -ENOENT;
sid->idx = e->idx; sid->idx = e->idx;

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

@ -62,7 +62,7 @@ static void *perf_evlist__poll_thread(void *arg)
if (perf_mmap__read_init(&map->core)) if (perf_mmap__read_init(&map->core))
continue; continue;
while ((event = perf_mmap__read_event(&map->core)) != NULL) { while ((event = perf_mmap__read_event(&map->core)) != NULL) {
struct evsel *evsel = perf_evlist__event2evsel(evlist, event); struct evsel *evsel = evlist__event2evsel(evlist, event);
if (evsel && evsel->side_band.cb) if (evsel && evsel->side_band.cb)
evsel->side_band.cb(event, evsel->side_band.data); evsel->side_band.cb(event, evsel->side_band.data);

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

@ -458,7 +458,7 @@ int perf_event__process_stat_event(struct perf_session *session,
count.ena = st->ena; count.ena = st->ena;
count.run = st->run; count.run = st->run;
counter = perf_evlist__id2evsel(session->evlist, st->id); counter = evlist__id2evsel(session->evlist, st->id);
if (!counter) { if (!counter) {
pr_err("Failed to resolve counter for stat event.\n"); pr_err("Failed to resolve counter for stat event.\n");
return -EINVAL; return -EINVAL;

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

@ -1643,7 +1643,7 @@ int perf_event__synthesize_id_index(struct perf_tool *tool, perf_event__handler_
e->id = evsel->core.id[j]; e->id = evsel->core.id[j];
sid = perf_evlist__id2sid(evlist, e->id); sid = evlist__id2sid(evlist, e->id);
if (!sid) { if (!sid) {
free(ev); free(ev);
return -ENOENT; return -ENOENT;