From 51aa13456993d38e7957946880f2695f48679c06 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 27 Nov 2018 13:11:46 +0000 Subject: lib: Show stacktrace when terminated by runner The igt_runner sends a SIGTERM to ask the test to cleanly exit upon an external timeout. It is useful to know what the code was doing when the timeout occurred, just in case it was unexpectedly stuck. However, since we use SIGTERM internally to marshal helper processes, we want to keep SIGTERM quiet, and so opt to use SIGQUIT for the timeout request instead. Signed-off-by: Chris Wilson Cc: Petri Latvala Reviewed-by: Petri Latvala --- lib/igt_core.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'lib/igt_core.c') diff --git a/lib/igt_core.c b/lib/igt_core.c index e0989f53..64883d64 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1852,14 +1852,29 @@ static struct { static igt_exit_handler_t exit_handler_fn[MAX_EXIT_HANDLERS]; static bool exit_handler_disabled; +static const struct { + int number; + const char *name; + size_t name_len; +} handled_signals[] = { #define SIGDEF(x) { x, #x, sizeof(#x) - 1 } #define SILENT(x) { x, NULL, 0 } -static const struct { int number; const char *name; size_t name_len; } handled_signals[] = - { SILENT(SIGINT), SILENT(SIGHUP), SILENT(SIGTERM), SILENT(SIGQUIT), - SILENT(SIGPIPE), SIGDEF(SIGABRT), SIGDEF(SIGSEGV), SIGDEF(SIGBUS), - SIGDEF(SIGFPE) }; + + SILENT(SIGINT), + SILENT(SIGHUP), + SILENT(SIGPIPE), + SILENT(SIGTERM), + + SIGDEF(SIGQUIT), /* used by igt_runner for its external timeout */ + + SIGDEF(SIGABRT), + SIGDEF(SIGSEGV), + SIGDEF(SIGBUS), + SIGDEF(SIGFPE) + #undef SILENT #undef SIGDEF +}; static int install_sig_handler(int sig_num, sighandler_t handler) { @@ -1940,15 +1955,15 @@ static void fatal_sig_handler(int sig) __write_stderr(handled_signals[i].name, handled_signals[i].name_len); write_stderr(".\n"); + + print_backtrace_sig_safe(); } if (crash_signal(sig)) { /* Linux standard to return exit code as 128 + signal */ if (!failed_one) igt_exitcode = 128 + sig; - failed_one = true; - print_backtrace_sig_safe(); if (in_subtest) exit_subtest("CRASH"); -- cgit v1.2.3