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

Commit 9dfb85df 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 time-to-tsc 



The perf test 'time-to-tsc' still use the legacy interface.

No functional change.

Commiter notes:

Testing it:

  # perf test tsc
  57: Convert perf time to TSC                              : 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-10-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 88e37a4b

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	union perf_event *event;

	union perf_event *event;

	u64 test_tsc, comm1_tsc, comm2_tsc;

	u64 test_tsc, comm1_tsc, comm2_tsc;

	u64 test_time, comm1_time = 0, comm2_time = 0;

	u64 test_time, comm1_time = 0, comm2_time = 0;

	struct perf_mmap *md;

	u64 end, start;





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

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

	CHECK_NOT_NULL__(threads);

	CHECK_NOT_NULL__(threads);
@@ -109,7 +111,11 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	perf_evlist__disable(evlist);

	perf_evlist__disable(evlist);





	for (i = 0; i < evlist->nr_mmaps; i++) {

	for (i = 0; i < evlist->nr_mmaps; i++) {

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

		md = &evlist->mmap[i];

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

			continue;



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

			struct perf_sample sample;

			struct perf_sample sample;





			if (event->header.type != PERF_RECORD_COMM ||

			if (event->header.type != PERF_RECORD_COMM ||
@@ -128,8 +134,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
				comm2_time = sample.time;

				comm2_time = sample.time;

			}

			}

next_event:

next_event:

			perf_evlist__mmap_consume(evlist, i);

			perf_mmap__consume(md, false);

		}

		}

		perf_mmap__read_done(md);

	}

	}





	if (!comm1_time || !comm2_time)

	if (!comm1_time || !comm2_time)