Commit e5685730 authored Sep 17, 2014 by Arnaldo Carvalho de Melo

perf record: Use ring buffer consume method to look like other tools

All builtins that consume events from perf's ring buffer now end up
calling perf_evlist__mmap_consume(), which will allow unmapping the ring
buffer when all the fds gets closed and all events in the buffer
consumed.

This is in preparation for the patchkit that will notice POLLHUP on
perf events file descriptors.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-8vhaeeoq11ppz0713el4xcps@git.kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 664fee3d

tools/perf/builtin-record.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -65,8 +65,9 @@ static int process_synthesized_event(struct perf_tool *tool,
		return record__write(rec, event, event->header.size);
		}

		static int record__mmap_read(struct record rec, struct perf_mmap md)
		static int record__mmap_read(struct record *rec, int idx)
		{
		struct perf_mmap *md = &rec->evlist->mmap[idx];
		unsigned int head = perf_mmap__read_head(md);
		unsigned int old = md->prev;
		unsigned char *data = md->base + page_size;
		@@ -102,8 +103,7 @@ static int record__mmap_read(struct record rec, struct perf_mmap md)
		}

		md->prev = old;
		perf_mmap__write_tail(md, old);

		perf_evlist__mmap_consume(rec->evlist, idx);
		out:
		return rc;
		}
		@@ -245,7 +245,7 @@ static int record__mmap_read_all(struct record *rec)

		for (i = 0; i < rec->evlist->nr_mmaps; i++) {
		if (rec->evlist->mmap[i].base) {
		if (record__mmap_read(rec, &rec->evlist->mmap[i]) != 0) {
		if (record__mmap_read(rec, i) != 0) {
		rc = -1;
		goto out;
		}