From 7e35ae8fc840cc1855d26084fdd72cbc3241f04d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 16 May 2014 17:05:19 -0700 Subject: Add SIGTRAP support to crasher and debuggerd. Bug: 15024256 Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e --- debuggerd/crasher.c | 4 ++++ debuggerd/debuggerd.cpp | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debuggerd') diff --git a/debuggerd/crasher.c b/debuggerd/crasher.c index 01ce0be..4721da9 100644 --- a/debuggerd/crasher.c +++ b/debuggerd/crasher.c @@ -144,6 +144,9 @@ static int do_action(const char* arg) close(pipe_fds[0]); write(pipe_fds[1], "oops", 4); return EXIT_SUCCESS; + } else if (!strcmp(arg, "SIGTRAP")) { + raise(SIGTRAP); + return EXIT_SUCCESS; } else if (!strcmp(arg, "heap-usage")) { abuse_heap(); } @@ -164,6 +167,7 @@ static int do_action(const char* arg) fprintf(stderr, " LOG_ALWAYS_FATAL_IF call LOG_ALWAYS_FATAL\n"); fprintf(stderr, " SIGPIPE cause a SIGPIPE\n"); fprintf(stderr, " SIGSEGV cause a SIGSEGV (synonym: crash)\n"); + fprintf(stderr, " SIGTRAP cause a SIGTRAP\n"); fprintf(stderr, "prefix any of the above with 'thread-' to not run\n"); fprintf(stderr, "on the process' main thread.\n"); return EXIT_SUCCESS; diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 76bd7a3..94232cf 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -322,15 +322,16 @@ static void handle_request(int fd) { } break; - case SIGILL: case SIGABRT: case SIGBUS: case SIGFPE: - case SIGSEGV: + case SIGILL: case SIGPIPE: + case SIGSEGV: #ifdef SIGSTKFLT case SIGSTKFLT: #endif + case SIGTRAP: XLOG("stopped -- fatal signal\n"); // Send a SIGSTOP to the process to make all of // the non-signaled threads stop moving. Without -- cgit v1.1