Commit 3c01bdf3 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' raw samples methods 

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

Reference: https://github.com/torvalds/linux/commit/44d2a5573665ab5dfb72572e43184388d15d695e



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

commit 44d2a557 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 59cf29a4

tools/perf/util/s390-sample-raw.c

+1 −2
Original line number Diff line number Diff line
@@ -195,8 +195,7 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample) 
 * its raw data.

 * The function is only invoked when the dump flag -D is set.

 */

void perf_evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event,

				  struct perf_sample *sample)

void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)

{

	struct evsel *ev_bc000;

tools/perf/util/sample-raw.c

+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
 * Check platform the perf data file was created on and perform platform

 * specific interpretation.

 */

void perf_evlist__init_trace_event_sample_raw(struct evlist *evlist)

void evlist__init_trace_event_sample_raw(struct evlist *evlist)

{

	const char *arch_pf = perf_env__arch(evlist->env);



	if (arch_pf && !strcmp("s390", arch_pf))

		evlist->trace_event_sample_raw = perf_evlist__s390_sample_raw;

		evlist->trace_event_sample_raw = evlist__s390_sample_raw;

}

tools/perf/util/sample-raw.h

+2 −5
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ struct evlist; 
union perf_event;

struct perf_sample;



void perf_evlist__s390_sample_raw(struct evlist *evlist,

				  union perf_event *event,

				  struct perf_sample *sample);



void perf_evlist__init_trace_event_sample_raw(struct evlist *evlist);

void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample);

void evlist__init_trace_event_sample_raw(struct evlist *evlist);

#endif /* __PERF_EVLIST_H */

tools/perf/util/session.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct perf_session *perf_session__new(struct perf_data *data, 
				perf_session__set_comm_exec(session);

			}



			perf_evlist__init_trace_event_sample_raw(session->evlist);

			evlist__init_trace_event_sample_raw(session->evlist);



			/* Open the directory data. */

			if (data->is_dir) {