Commit b3bb999f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by PvsNarasimha
Browse files

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

mainline inclusion
from mainline-v5.11-rc1
commit 3ccf8a7b
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/3ccf8a7b66b6bff69a7be62f2d5a2a61328ebe91



--------------------------------

commit 3ccf8a7b upstream

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent 74ef8f41

tools/perf/builtin-script.c

+1 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,7 @@ static int print_event_with_time(struct perf_tool *tool, 
{

	struct perf_script *script = container_of(tool, struct perf_script, tool);

	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;



	if (evsel && !evsel->core.attr.sample_id_all) {

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static int deliver_event(struct ordered_events *qe, 
		goto next_event;

	}



	evsel = perf_evlist__id2evsel(session->evlist, sample.id);

	evsel = evlist__id2evsel(session->evlist, sample.id);

	assert(evsel != NULL);



	if (event->header.type == PERF_RECORD_SAMPLE) {

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3111,7 +3111,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st 
		return;

	}



	evsel = perf_evlist__id2evsel(trace->evlist, sample->id);

	evsel = evlist__id2evsel(trace->evlist, sample->id);

	if (evsel == NULL) {

		fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample->id);

		return;

tools/perf/tests/mmap-basic.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
		}



		err = -1;

		evsel = perf_evlist__id2evsel(evlist, sample.id);

		evsel = evlist__id2evsel(evlist, sample.id);

		if (evsel == NULL) {

			pr_debug("event with id %" PRIu64

				 " doesn't map to an evsel\n", sample.id);

tools/perf/tests/switch-tracking.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int process_sample_event(struct evlist *evlist, 
		return -1;

	}



	evsel = perf_evlist__id2evsel(evlist, sample.id);

	evsel = evlist__id2evsel(evlist, sample.id);

	if (evsel == switch_tracking->switch_evsel) {

		next_tid = evsel__intval(evsel, &sample, "next_pid");

		prev_tid = evsel__intval(evsel, &sample, "prev_pid");