commit ae2b746c8274845c64d2d62ddc8f3a0b07a05f35
author Elliott Hughes <enh@google.com> Tue Feb 16 18:23:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 16 18:23:32 2016 +0000
tree 99fc757d4b5852260b75087c54e1a32dcb665314
parent 9c9818374eb4a867c5edc97be65ad0b682302435
parent bc31090b7a1784b765a171d82976a5ec410bfa1d

Merge "Don't go busy loop when waiting child process."

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index 28d6de7..ccbe0bf 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -408,7 +408,7 @@
         if (poll_fds[0].revents & POLLHUP) {
             int ret;
 
-            ret = waitpid(pid, &status, WNOHANG);
+            ret = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
             if (ret < 0) {
                 rc = errno;
                 ALOG(LOG_ERROR, "logwrap", "waitpid failed with %s\n", strerror(errno));