Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 334f823e authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Switch to new perf_mmap__read_event() interface for mmap-basic 



The perf test 'mmap-basic' still use the legacy interface.

No functional change.

Committer notes:

Testing it:

  # perf test "mmap interface"
   4: Read samples using the mmap interface                 : Ok
  #

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1519945751-37786-7-git-send-email-kan.liang@linux.intel.com


[ Changed bool parameters from 0 to 'false', as per Jiri comment ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 693d32ae

tools/perf/tests/mmap-basic.c

+10 −2
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
		     expected_nr_events[nsyscalls], i, j;

	struct perf_evsel *evsels[nsyscalls], *evsel;

	char sbuf[STRERR_BUFSIZE];

	struct perf_mmap *md;

	u64 end, start;



	threads = thread_map__new(-1, getpid(), UINT_MAX);

	if (threads == NULL) {
@@ -106,7 +108,11 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
			++foo;

		}



	while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) {

	md = &evlist->mmap[0];

	if (perf_mmap__read_init(md, false, &start, &end) < 0)

		goto out_init;



	while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {

		struct perf_sample sample;



		if (event->header.type != PERF_RECORD_SAMPLE) {
@@ -129,9 +135,11 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
			goto out_delete_evlist;

		}

		nr_events[evsel->idx]++;

		perf_evlist__mmap_consume(evlist, 0);

		perf_mmap__consume(md, false);

	}

	perf_mmap__read_done(md);



out_init:

	err = 0;

	evlist__for_each_entry(evlist, evsel) {

		if (nr_events[evsel->idx] != expected_nr_events[evsel->idx]) {