diff options
| author | Elliott Hughes <enh@google.com> | 2016-08-23 20:10:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-23 20:10:01 +0000 |
| commit | 76b4b4aaeee285ed75a802244f9993d4ef455f80 (patch) | |
| tree | 8bb3ad8dbd9bd6380dd34def0867f1036cd34838 /debuggerd/debuggerd.cpp | |
| parent | 08134d0acdadb1c85c378c6e37a19e3e20698202 (diff) | |
| parent | 17461114d642fc7dfe1900b4ac1883301ca59491 (diff) | |
Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06
am: 0d2ef3dc86
Change-Id: Ie8ae5707455f4d1741ca87ef515ea9a142e05aa5
Diffstat (limited to 'debuggerd/debuggerd.cpp')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 12fa4e631f..a26aa9879e 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -203,8 +203,6 @@ static int read_request(int fd, debugger_request_t* out_request) { } ALOGV("reading tid"); - fcntl(fd, F_SETFL, O_NONBLOCK); - pollfd pollfds[1]; pollfds[0].fd = fd; pollfds[0].events = POLLIN; @@ -879,7 +877,7 @@ static int do_server() { socklen_t alen = sizeof(ss); ALOGV("waiting for connection\n"); - int fd = accept4(s, addrp, &alen, SOCK_CLOEXEC); + int fd = accept4(s, addrp, &alen, SOCK_CLOEXEC | SOCK_NONBLOCK); if (fd == -1) { ALOGE("accept failed: %s\n", strerror(errno)); continue; |