Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "perf record: Intercept all events"

This reverts commit f5a2c3dce03621b55f84496f58adc2d1a87ca16f.

This patch is required for making "perf lock rec" work.
The commit f5a2c3dce0 changes write_event() of builtin-record.c
. And changed write_event() sometimes doesn't stop with perf
lock rec.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <new-submission>
[ that commit also causes perf record to not be Ctrl-C-able,
and it's concetually wrong to parse the data at record time
(unconditionally - even when not needed), as we eventually
want to be able to do zero-copy recording, at least for
non-archive recordings. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Hitoshi Mitake and committed by
Ingo Molnar
a8e6f734 6a1b751f

+10 -18
+10 -18
tools/perf/builtin-record.c
··· 113 113 114 114 static void write_event(event_t *buf, size_t size) 115 115 { 116 - size_t processed_size = buf->header.size; 117 - event_t *ev = buf; 118 - 119 - do { 120 - /* 121 - * Add it to the list of DSOs, so that when we finish this 122 - * record session we can pick the available build-ids. 123 - */ 124 - if (ev->header.type == PERF_RECORD_MMAP) { 125 - struct list_head *head = &dsos__user; 126 - if (ev->header.misc == 1) 127 - head = &dsos__kernel; 128 - __dsos__findnew(head, ev->mmap.filename); 129 - } 130 - 131 - ev = ((void *)ev) + ev->header.size; 132 - processed_size += ev->header.size; 133 - } while (processed_size < size); 116 + /* 117 + * Add it to the list of DSOs, so that when we finish this 118 + * record session we can pick the available build-ids. 119 + */ 120 + if (buf->header.type == PERF_RECORD_MMAP) { 121 + struct list_head *head = &dsos__user; 122 + if (buf->mmap.header.misc == 1) 123 + head = &dsos__kernel; 124 + __dsos__findnew(head, buf->mmap.filename); 125 + } 134 126 135 127 write_output(buf, size); 136 128 }