perf tools: Ensure single disable call per event in record comand
authorJiri Olsa <jolsa@redhat.com>
Mon, 12 Nov 2012 17:34:02 +0000 (18:34 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 14 Nov 2012 19:52:09 +0000 (16:52 -0300)
It's possible we issue the event disable ioctl multiple times until we
read the final portion of the mmap buffer.

Ensuring just single disable ioctl call for event, because there's no
need to do that more than once.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1352741644-16809-4-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-record.c

index 268b356391fc25bff4bee38cd232a8a4393ab1d2..f3151d3c70ce15c6b93e57a8c3ebe0f70425f0a8 100644 (file)
@@ -502,6 +502,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
        struct perf_evlist *evsel_list = rec->evlist;
        const char *output_name = rec->output_name;
        struct perf_session *session;
+       bool disabled = false;
 
        rec->progname = argv[0];
 
@@ -735,8 +736,10 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
                 * die with the process and we wait for that. Thus no need to
                 * disable events in this case.
                 */
-               if (done && !perf_target__none(&opts->target))
+               if (done && !disabled && !perf_target__none(&opts->target)) {
                        perf_evlist__disable(evsel_list);
+                       disabled = true;
+               }
        }
 
        if (quiet || signr == SIGUSR1)