Re: [GIT PULL] perf fixes

[Arnaldo Carvalho de Melo <acme@ghostprotocols.net>]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

Em Mon, Oct 28, 2013 at 09:34:11AM -0300, Arnaldo Carvalho de Melo escreveu:
> And then, when reverting it, Stephane forgot to match the number number
> of expected entries to be matched/assigned from 8 to 5, can you try with
> the following patch instead?

Does the wording on this commit log sounds about right to you?

- Arnaldo

[-- Attachment #2: a.patch --]
[-- Type: text/plain, Size: 1478 bytes --]

commit 2fd869f08aec5a8e4cbf01bc3fa345c4e53342d7
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Mon Oct 28 09:38:12 2013 -0300

    perf tools: Fix up /proc/PID/maps parsing
    
    When introducing support for MMAP2 we considered more parts of each map
    representation in /proc/PID/maps, and when disabling it we forgot to
    reduce the number of expected parsed/assigned entries in the sscanf
    call, fix it to expect the right number of desired fields, 5.
    
    Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Based-on-a-patch-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    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-vrbo1wik997ahjzl1chm3bdm@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 63df031fc9c7..49096ea58a15 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -213,7 +213,7 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
 		       &event->mmap.pgoff,
 		       execname);
 
-		if (n != 8)
+		if (n != 5)
 			continue;
 
 		if (prot[2] != 'x')