perf record: Fix fast task-exit race
authorIngo Molnar <mingo@elte.hu>
Mon, 15 Jun 2009 06:17:12 +0000 (08:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 15 Jun 2009 07:08:31 +0000 (09:08 +0200)
Recording with -a (or with -p) can race with tasks going away:

   couldn't open /proc/8440/maps

Causing an early exit() and no recording done.

Do not abort the recording session - instead just skip that task.

Also, only print the warnings under -v.

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>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-record.c

index a177a591b52cdb377b7eee330be286d102d16fa5..e1dfef24887fdd8653534f4283d813623fde4e69 100644 (file)
@@ -202,8 +202,12 @@ static void pid_synthesize_comm_event(pid_t pid, int full)
 
        fd = open(filename, O_RDONLY);
        if (fd < 0) {
-               fprintf(stderr, "couldn't open %s\n", filename);
-               exit(EXIT_FAILURE);
+               /*
+                * We raced with a task exiting - just return:
+                */
+               if (verbose)
+                       fprintf(stderr, "couldn't open %s\n", filename);
+               return;
        }
        if (read(fd, bf, sizeof(bf)) < 0) {
                fprintf(stderr, "couldn't read %s\n", filename);
@@ -273,8 +277,12 @@ static void pid_synthesize_mmap_samples(pid_t pid)
 
        fp = fopen(filename, "r");
        if (fp == NULL) {
-               fprintf(stderr, "couldn't open %s\n", filename);
-               exit(EXIT_FAILURE);
+               /*
+                * We raced with a task exiting - just return:
+                */
+               if (verbose)
+                       fprintf(stderr, "couldn't open %s\n", filename);
+               return;
        }
        while (1) {
                char bf[BUFSIZ], *pbf = bf;