openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 50a99aa6cb

Change-Id: Id66bc64ba1aee8c12f8609bc6013a59f6e95ccad
This commit is contained in:
Elliott Hughes 2016-08-23 20:14:01 +00:00 committed by android-build-merger
parent 9f0c6916c7 50a99aa6cb
commit fc04dce0f1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debuggerd/debuggerd.cpp
View File

@ -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;