Messages in this thread | | | Date | Fri, 24 May 2013 11:08:17 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH] perf record: handle death by SIGTERM |
| |
On Mon, May 06, 2013 at 12:24:23PM -0600, David Ahern wrote: > perf data files cannot be processed until the header file is update > which is done via an on_exit handler. If perf is killed due to a SIGTERM > it does not run the on_exit hooks leaving the perf.data file in a > random state which perf-report will happily spin on trying to read. As > noted by Mike an easy reproducer is: > perf record -a -g & sleep 1; killall perf > > Fix by catching SIGTERM like it does SIGINT. Also need to remove the > kill which was added via commit f7b7c26e. > > Signed-off-by: David Ahern <dsahern@gmail.com> > Cc: Mike Galbraith <efault@gmx.de> > Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> > Cc: Ingo Molnar <mingo@kernel.org> > Cc: Frederic Weisbecker <fweisbec@gmail.com> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Stephane Eranian <eranian@google.com> > --- > tools/perf/builtin-record.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c > index cdf58ec..fff985c 100644 > --- a/tools/perf/builtin-record.c > +++ b/tools/perf/builtin-record.c > @@ -198,7 +198,6 @@ static void perf_record__sig_exit(int exit_status __maybe_unused, void *arg) > return; > > signal(signr, SIG_DFL); > - kill(getpid(), signr); > } > > static bool perf_evlist__equal(struct perf_evlist *evlist, > @@ -404,6 +403,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) > signal(SIGCHLD, sig_handler); > signal(SIGINT, sig_handler); > signal(SIGUSR1, sig_handler); > + signal(SIGTERM, sig_handler); > > if (!output_name) { > if (!fstat(STDOUT_FILENO, &st) && S_ISFIFO(st.st_mode)) > -- > 1.7.10.1 >
hi, got a perf test hanging on me on latest acme's perf/core and bisected it to this one. I separated reproducer so far but probably wont get to it this week:
[jolsa@krava2 perf]$ cat /proc/sys/kernel/perf_event_paranoid 1 [jolsa@krava2 perf]$ ./perf record -C 0 kill Error: You may not have permission to collect %sstats. Consider tweaking /proc/sys/kernel/perf_event_paranoid: -1 - Not paranoid at all 0 - Disallow raw tracepoint access for unpriv 1 - Disallow cpu events for unpriv 2 - Disallow kernel profiling for unpriv
jirka
| |