From 424e07fcf655b65306bb846115e22594d6527056 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 8 Mar 2012 15:27:49 -0800 Subject: Reduce suicidal tendencies Some changes to debuggerd: (1) Send a SIGSTOP to the target process before doing any of the PTRACE_ATTACH work. This causes the threads that weren't hit by the signal to stop moving, which seems to get rid of the "ptrace detach failed: No such process" problems that result in missed stack traces and debuggerd self-immolation. (2) SIGPIPE was in the list of "interesting" signals caught by debugger_signal_handler(), but debuggerd didn't recognize it, and you'd get "unexpected signal 13" complaints. It's now in the list. (3) Fixed a bit-rotted XLOG. Change-Id: I33297ea6b09ce450671c07dc25846f684afbf480 --- debuggerd/debuggerd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'debuggerd') diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c index 0f05bfd8..662683a6 100644 --- a/debuggerd/debuggerd.c +++ b/debuggerd/debuggerd.c @@ -64,6 +64,7 @@ static const char *get_signame(int sig) case SIGBUS: return "SIGBUS"; case SIGFPE: return "SIGFPE"; case SIGSEGV: return "SIGSEGV"; + case SIGPIPE: return "SIGPIPE"; case SIGSTKFLT: return "SIGSTKFLT"; case SIGSTOP: return "SIGSTOP"; default: return "?"; @@ -719,7 +720,8 @@ static void handle_request(int fd) { request_t request; int status = read_request(fd, &request); if (!status) { - XLOG("BOOM: pid=%d uid=%d gid=%d tid=%d\n", pid, uid, gid, tid); + XLOG("BOOM: pid=%d uid=%d gid=%d tid=%d\n", + request.pid, request.uid, request.gid, request.tid); /* At this point, the thread that made the request is blocked in * a read() call. If the thread has crashed, then this gives us @@ -776,8 +778,16 @@ static void handle_request(int fd) { case SIGBUS: case SIGFPE: case SIGSEGV: + case SIGPIPE: case SIGSTKFLT: { XLOG("stopped -- fatal signal\n"); + /* + * Send a SIGSTOP to the process to make all of + * the non-signaled threads stop moving. Without + * this we get a lot of "ptrace detach failed: + * No such process". + */ + kill(request.pid, SIGSTOP); /* don't dump sibling threads when attaching to GDB because it * makes the process less reliable, apparently... */ tombstone_path = engrave_tombstone(request.pid, request.tid, @@ -861,8 +871,8 @@ static int do_server() { signal(SIGBUS, SIG_DFL); signal(SIGFPE, SIG_DFL); signal(SIGSEGV, SIG_DFL); - signal(SIGSTKFLT, SIG_DFL); signal(SIGPIPE, SIG_DFL); + signal(SIGSTKFLT, SIG_DFL); logsocket = socket_local_client("logd", ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_DGRAM); -- cgit v1.2.3