diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:28:10 -0800 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2013-11-22 13:44:43 -0800 |
| commit | 66ed50af6870210ce013a5588a688434a5d48ee9 (patch) | |
| tree | a879f3ea31083496d0efe491bc187b6e0ebada39 /debuggerd | |
| parent | dd2ac3de625e6c0328a0f70530d8ade0d2151bfc (diff) | |
| parent | 536dea9d61a032e64bbe584a97463c6638ead009 (diff) | |
| download | system_core-66ed50af6870210ce013a5588a688434a5d48ee9.zip system_core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.gz system_core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.bz2 | |
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/debuggerd.c | 9 | ||||
| -rw-r--r-- | debuggerd/tombstone.c | 2 | ||||
| -rw-r--r-- | debuggerd/utility.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c index da2e9b0..756f7bb 100644 --- a/debuggerd/debuggerd.c +++ b/debuggerd/debuggerd.c @@ -31,9 +31,10 @@ #include <sys/stat.h> #include <sys/poll.h> +#include <log/logd.h> +#include <log/logger.h> + #include <cutils/sockets.h> -#include <cutils/logd.h> -#include <cutils/logger.h> #include <cutils/properties.h> #include <cutils/debugger.h> @@ -435,11 +436,13 @@ static int do_server() { signal(SIGBUS, SIG_DFL); signal(SIGFPE, SIG_DFL); signal(SIGSEGV, SIG_DFL); - signal(SIGPIPE, SIG_DFL); #ifdef SIGSTKFLT signal(SIGSTKFLT, SIG_DFL); #endif + // Ignore failed writes to closed sockets + signal(SIGPIPE, SIG_IGN); + logsocket = socket_local_client("logd", ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_DGRAM); if(logsocket < 0) { diff --git a/debuggerd/tombstone.c b/debuggerd/tombstone.c index 48d7aa9..aa63547 100644 --- a/debuggerd/tombstone.c +++ b/debuggerd/tombstone.c @@ -29,7 +29,7 @@ #include <private/android_filesystem_config.h> -#include <cutils/logger.h> +#include <log/logger.h> #include <cutils/properties.h> #include <backtrace/backtrace.h> diff --git a/debuggerd/utility.c b/debuggerd/utility.c index 9bf3c18..41be982 100644 --- a/debuggerd/utility.c +++ b/debuggerd/utility.c @@ -22,7 +22,7 @@ #include <errno.h> #include <unistd.h> #include <signal.h> -#include <cutils/logd.h> +#include <log/logd.h> #include <sys/ptrace.h> #include <sys/wait.h> #include <arpa/inet.h> |