commit 11f4e7912bcece1c135bb818d1cab40c5c9c56d1
author Elliott Hughes <enh@google.com> Tue Aug 23 20:14:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 20:14:01 2016 +0000
tree 03f859cb17bedecd03e630537bd7c6da254dd92c
parent 416671f6215938e2eeb4b265932c6ec3531dedce
parent 76b4b4aaeee285ed75a802244f9993d4ef455f80

Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06 am: 0d2ef3dc86
am: 50a99aa6cb

Change-Id: Id66bc64ba1aee8c12f8609bc6013a59f6e95ccad

debuggerd/debuggerd.cpp

diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 12fa4e6..a26aa98 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -203,8 +203,6 @@
   }
 
   ALOGV("reading tid");
-  fcntl(fd, F_SETFL, O_NONBLOCK);
-
   pollfd pollfds[1];
   pollfds[0].fd = fd;
   pollfds[0].events = POLLIN;
@@ -879,7 +877,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;