diff options
| author | Linus Torvalds <[email protected]> | 2018-02-18 12:38:40 -0800 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-02-18 12:38:40 -0800 | 
| commit | 9ca2c16f3b4311affcc80c2d0516b2b09709b7d9 (patch) | |
| tree | 0913ad49c3abdbd3a6077ac3aa9e9dabc41be271 /tools/perf/tests/backward-ring-buffer.c | |
| parent | 2d6c4e40ab7eb1ab7b8cd4a232b0c9554ea8de9b (diff) | |
| parent | 297f9233b53a08fd457815e19f1d6f2c3389857b (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf updates from Thomas Gleixner:
 "Perf tool updates and kprobe fixes:
   - perf_mmap overwrite mode fixes/overhaul, prep work to get 'perf
     top' using it, making it bearable to use it in large core count
     systems such as Knights Landing/Mill Intel systems (Kan Liang)
   - s/390 now uses syscall.tbl, just like x86-64 to generate the
     syscall table id -> string tables used by 'perf trace' (Hendrik
     Brueckner)
   - Use strtoull() instead of home grown function (Andy Shevchenko)
   - Synchronize kernel ABI headers, v4.16-rc1 (Ingo Molnar)
   - Document missing 'perf data --force' option (Sangwon Hong)
   - Add perf vendor JSON metrics for ARM Cortex-A53 Processor (William
     Cohen)
   - Improve error handling and error propagation of ftrace based
     kprobes so failures when installing kprobes are not silently
     ignored and create disfunctional tracepoints"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  kprobes: Propagate error from disarm_kprobe_ftrace()
  kprobes: Propagate error from arm_kprobe_ftrace()
  Revert "tools include s390: Grab a copy of arch/s390/include/uapi/asm/unistd.h"
  perf s390: Rework system call table creation by using syscall.tbl
  perf s390: Grab a copy of arch/s390/kernel/syscall/syscall.tbl
  tools/headers: Synchronize kernel ABI headers, v4.16-rc1
  perf test: Fix test trace+probe_libc_inet_pton.sh for s390x
  perf data: Document missing --force option
  perf tools: Substitute yet another strtoull()
  perf top: Check the latency of perf_top__mmap_read()
  perf top: Switch default mode to overwrite mode
  perf top: Remove lost events checking
  perf hists browser: Add parameter to disable lost event warning
  perf top: Add overwrite fall back
  perf evsel: Expose the perf_missing_features struct
  perf top: Check per-event overwrite term
  perf mmap: Discard legacy interface for mmap read
  perf test: Update mmap read functions for backward-ring-buffer test
  perf mmap: Introduce perf_mmap__read_event()
  perf mmap: Introduce perf_mmap__read_done()
  ...
Diffstat (limited to 'tools/perf/tests/backward-ring-buffer.c')
| -rw-r--r-- | tools/perf/tests/backward-ring-buffer.c | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c index 4035d43523c3..e0b1b414d466 100644 --- a/tools/perf/tests/backward-ring-buffer.c +++ b/tools/perf/tests/backward-ring-buffer.c @@ -31,10 +31,12 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count,  	int i;  	for (i = 0; i < evlist->nr_mmaps; i++) { +		struct perf_mmap *map = &evlist->overwrite_mmap[i];  		union perf_event *event; +		u64 start, end; -		perf_mmap__read_catchup(&evlist->overwrite_mmap[i]); -		while ((event = perf_mmap__read_backward(&evlist->overwrite_mmap[i])) != NULL) { +		perf_mmap__read_init(map, true, &start, &end); +		while ((event = perf_mmap__read_event(map, true, &start, end)) != NULL) {  			const u32 type = event->header.type;  			switch (type) { @@ -49,6 +51,7 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count,  				return TEST_FAIL;  			}  		} +		perf_mmap__read_done(map);  	}  	return TEST_OK;  }  |