Commit 9d4ecc88 authored Nov 13, 2013 by Don Zickus Committed by Arnaldo Carvalho de Melo Nov 14, 2013

perf tools: Synthesize anon MMAP records again



When introducing the PERF_RECORD_MMAP2 in:

5c5e854b perf tools: Add attr->mmap2 support

A check for the number of entries parsed by sscanf was introduced that
assumed all of the 8 fields needed to be correctly parsed so that
particular /proc/pid/maps line would be considered synthesizable.

That broke anon records synthesizing, as it doesn't have the 'execname'
field.

Fix it by keeping the sscanf return check, changing it to not require
that the 'execname' variable be parsed, so that the preexisting logic
can kick in and set it to '//anon'.

This should get things like JIT profiling working again.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Bill Gray <bgray@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Richard Fowles <rfowles@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/n/tip-bo4akalno7579shpz29u867j@git.kernel.org


[ commit log message is mine, dzickus reported the problem with a patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent ea432a8b

tools/perf/util/event.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -209,8 +209,10 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
		&event->mmap.start, &event->mmap.len, prot,
		&event->mmap.pgoff,
		execname);

		if (n != 5)
		/*
		* Anon maps don't have the execname.
		*/
		if (n < 4)
		continue;
		/*
		* Just like the kernel, see __perf_event_mmap in kernel/perf_event.c

Admin message