Commit 804f7ac7 authored May 06, 2013 by David Ahern Committed by Arnaldo Carvalho de Melo May 28, 2013

perf record: handle death by SIGTERM



Perf data files cannot be processed until the header is updated 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.

Acked-by: Stephane Eranian <eranian@google.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1367864663-1309-1-git-send-email-dsahern@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 89365e6c

tools/perf/builtin-record.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

Admin message