diff options
| author | Elliott Hughes <enh@google.com> | 2016-08-22 14:17:25 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-08-22 14:17:25 -0700 |
| commit | 874c674c60bf58a65e0d6e65c5f6d20fff0db3cf (patch) | |
| tree | 0073de2439c0f0c7fbb8bc56bb1ff5c1c479b4ad /debuggerd | |
| parent | e5b7ad1c3969da554da5fe479cb874436b75ac5c (diff) | |
| download | system_core-874c674c60bf58a65e0d6e65c5f6d20fff0db3cf.tar.gz system_core-874c674c60bf58a65e0d6e65c5f6d20fff0db3cf.tar.bz2 system_core-874c674c60bf58a65e0d6e65c5f6d20fff0db3cf.zip | |
debuggerd: set SOCK_NONBLOCK in accept rather than later.
Change-Id: I95586984dd7aec798d75b150be238d5f6f7c91da
Diffstat (limited to 'debuggerd')
| -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 61cceb048..c578d658b 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -193,8 +193,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; @@ -828,7 +826,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; |