Skip to content

Commit

Permalink
perf test: Switch to new perf_mmap__read_event() interface for sw-clock
Browse files Browse the repository at this point in the history
The perf test 'sw-clock' still use the legacy interface.

No functional change.

Committer testing:

  # perf test clock
  22: Software clock events period values                   : Ok
  #

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Arnaldo 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-11-git-send-email-kan.liang@linux.intel.com
[ Changed bool parameters from 0 to 'false', as per Jiri comment ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Kan Liang authored and Arnaldo Carvalho de Melo committed Mar 5, 2018
1 parent 9dfb85d commit 5d0007c
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions tools/perf/tests/sw-clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
};
struct cpu_map *cpus;
struct thread_map *threads;
struct perf_mmap *md;
u64 end, start;

attr.sample_freq = 500;

Expand Down Expand Up @@ -93,7 +95,11 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)

perf_evlist__disable(evlist);

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)
Expand All @@ -108,9 +114,11 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
total_periods += sample.period;
nr_samples++;
next_event:
perf_evlist__mmap_consume(evlist, 0);
perf_mmap__consume(md, false);
}
perf_mmap__read_done(md);

out_init:
if ((u64) nr_samples == total_periods) {
pr_debug("All (%d) samples have period value of 1!\n",
nr_samples);
Expand Down

0 comments on commit 5d0007c

Please sign in to comment.