commit 066078761c0fe6723f69d2c32b6ab3975df4220c
author Elliott Hughes <enh@google.com> Mon Aug 22 14:17:25 2016 -0700
committer Elliott Hughes <enh@google.com> Mon Aug 22 14:17:25 2016 -0700
tree 0073de2439c0f0c7fbb8bc56bb1ff5c1c479b4ad
parent bce5c6bc99df053e2aed8f2fc506d3c49d27e5e9

debuggerd: set SOCK_NONBLOCK in accept rather than later.

Change-Id: I95586984dd7aec798d75b150be238d5f6f7c91da

debuggerd/debuggerd.cpp

diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 61cceb0..c578d65 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -193,8 +193,6 @@
   }
 
   ALOGV("reading tid");
-  fcntl(fd, F_SETFL, O_NONBLOCK);
-
   pollfd pollfds[1];
   pollfds[0].fd = fd;
   pollfds[0].events = POLLIN;
@@ -828,7 +826,7 @@
     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;