Commit 74ef8f41 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 parsing methods 

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

Reference: https://github.com/torvalds/linux/commit/2a6599cd5e093b3c607a39288f14a618c03a0e24



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

commit 2a6599cd 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 3c01bdf3

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
		return (err == -EAGAIN) ? 0 : -1;



	while ((event = perf_mmap__read_event(&md->core)) != NULL) {

		err = perf_evlist__parse_sample_timestamp(evlist, event, &timestamp);

		err = evlist__parse_sample_timestamp(evlist, event, &timestamp);

		if (err) {

			perf_mmap__consume(&md->core);

			pr_err("Failed to parse sample\n");

tools/perf/builtin-top.c

+2 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
	while ((event = perf_mmap__read_event(&md->core)) != NULL) {

		int ret;



		ret = perf_evlist__parse_sample_timestamp(evlist, event, &last_timestamp);

		ret = evlist__parse_sample_timestamp(evlist, event, &last_timestamp);

		if (ret && ret != -1)

			break;
@@ -1153,7 +1153,7 @@ static int deliver_event(struct ordered_events *qe, 
		return 0;

	}



	ret = perf_evlist__parse_sample(evlist, event, &sample);

	ret = evlist__parse_sample(evlist, event, &sample);

	if (ret) {

		pr_err("Can't parse sample, err = %d\n", ret);

		goto next_event;

tools/perf/builtin-trace.c

+2 −3
Original line number Diff line number Diff line
@@ -3706,9 +3706,8 @@ static int __trace__deliver_event(struct trace *trace, union perf_event *event) 
{

	struct evlist *evlist = trace->evlist;

	struct perf_sample sample;

	int err;

	int err = evlist__parse_sample(evlist, event, &sample);



	err = perf_evlist__parse_sample(evlist, event, &sample);

	if (err)

		fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);

	else
@@ -3741,7 +3740,7 @@ static int trace__deliver_event(struct trace *trace, union perf_event *event) 
	if (!trace->sort_events)

		return __trace__deliver_event(trace, event);



	err = perf_evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);

	err = evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);

	if (err && err != -1)

		return err;

tools/perf/tests/code-reading.c

+2 −2
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ static int process_sample_event(struct machine *machine, 
	struct thread *thread;

	int ret;



	if (perf_evlist__parse_sample(evlist, event, &sample)) {

		pr_debug("perf_evlist__parse_sample failed\n");

	if (evlist__parse_sample(evlist, event, &sample)) {

		pr_debug("evlist__parse_sample failed\n");

		return -1;

	}

tools/perf/tests/mmap-basic.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
			goto out_delete_evlist;

		}



		err = perf_evlist__parse_sample(evlist, event, &sample);

		err = evlist__parse_sample(evlist, event, &sample);

		if (err) {

			pr_err("Can't parse sample, err = %d\n", err);

			goto out_delete_evlist;