Commit cb0b29e0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evlist: Introduce perf_evlist__parse_sample 

That is a more compact form of perf_session__parse_sample and to support
multiple evlists per perf_session is the way to go anyway.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-vkxx3j5qktoj11bvcwmfjj13@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7b56cce2

tools/perf/builtin-test.c

+2 −6
Original line number Diff line number Diff line
@@ -562,9 +562,7 @@ static int test__basic_mmap(void) 
			goto out_munmap;

		}



		err = perf_event__parse_sample(event, attr.sample_type,

					       evsels[0]->sample_size,

					       false, &sample, false);

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

		if (err) {

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

			goto out_munmap;
@@ -781,9 +779,7 @@ static int test__PERF_RECORD(void) 
				if (type < PERF_RECORD_MAX)

					nr_events[type]++;



				err = perf_event__parse_sample(event, evsel->attr.sample_type,

							       evsel->sample_size, true,

							       &sample, false);

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

				if (err < 0) {

					if (verbose)

						perf_event__fprintf(event, stderr);

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
	int ret;



	while ((event = perf_evlist__mmap_read(top->evlist, idx)) != NULL) {

		ret = perf_session__parse_sample(session, event, &sample);

		ret = perf_evlist__parse_sample(top->evlist, event, &sample, false);

		if (ret) {

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

			continue;

tools/perf/util/evlist.c

+9 −0
Original line number Diff line number Diff line
@@ -881,3 +881,12 @@ int perf_evlist__start_workload(struct perf_evlist *evlist) 


	return 0;

}



int perf_evlist__parse_sample(struct perf_evlist *evlist,

			      const union perf_event *event,

			      struct perf_sample *sample, bool swapped)

{

	struct perf_evsel *e = list_entry(evlist->entries.next, struct perf_evsel, node);

	return perf_event__parse_sample(event, e->attr.sample_type, e->sample_size,

					e->attr.sample_id_all, sample, swapped);

}

tools/perf/util/evlist.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ u64 perf_evlist__sample_type(const struct perf_evlist *evlist); 
bool perf_evlist__sample_id_all(const const struct perf_evlist *evlist);

u16 perf_evlist__id_hdr_size(const struct perf_evlist *evlist);



int perf_evlist__parse_sample(struct perf_evlist *evlist,

			      const union perf_event *event,

			      struct perf_sample *sample, bool swapped);



bool perf_evlist__valid_sample_type(const struct perf_evlist *evlist);

bool perf_evlist__valid_sample_id_all(const struct perf_evlist *evlist);

tools/perf/util/python.c

+1 −5
Original line number Diff line number Diff line
@@ -797,17 +797,13 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, 


	event = perf_evlist__mmap_read(evlist, cpu);

	if (event != NULL) {

		struct perf_evsel *first;

		PyObject *pyevent = pyrf_event__new(event);

		struct pyrf_event *pevent = (struct pyrf_event *)pyevent;



		if (pyevent == NULL)

			return PyErr_NoMemory();



		first = list_entry(evlist->entries.next, struct perf_evsel, node);

		err = perf_event__parse_sample(event, first->attr.sample_type,

					       first->sample_size,

					       sample_id_all, &pevent->sample, false);

		err = perf_evlist__parse_sample(evlist, event, &pevent->sample, false);

		if (err)

			return PyErr_Format(PyExc_OSError,

					    "perf: can't parse sample, err=%d", err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE