Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758575Ab3EFWkv (ORCPT ); Mon, 6 May 2013 18:40:51 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]:51076 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757534Ab3EFWku (ORCPT ); Mon, 6 May 2013 18:40:50 -0400 MIME-Version: 1.0 In-Reply-To: <1367864663-1309-1-git-send-email-dsahern@gmail.com> References: <1367864663-1309-1-git-send-email-dsahern@gmail.com> Date: Tue, 7 May 2013 00:40:49 +0200 Message-ID: Subject: Re: [PATCH] perf record: handle death by SIGTERM From: Stephane Eranian To: David Ahern Cc: Arnaldo Carvalho de Melo , LKML , Mike Galbraith , Ingo Molnar , Frederic Weisbecker , Peter Zijlstra , Jiri Olsa , Namhyung Kim Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2216 Lines: 56 This is a good fix. I have run into this infinite loop in perf report many times. Thanks David. On Mon, May 6, 2013 at 8:24 PM, 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 > Cc: Mike Galbraith > Cc: Arnaldo Carvalho de Melo > Cc: Ingo Molnar > Cc: Frederic Weisbecker > Cc: Peter Zijlstra > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Stephane Eranian > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/