commit 2364a3fc729a8a02c9824dad8bf5d8df9dbeb384
author Elliott Hughes <enh@google.com> Tue Feb 16 20:45:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 16 20:45:52 2016 +0000
tree 82ae8ff67abec0d8119b63840ff1aa42a5a9d729
parent 27e0a25101c396eab32910a1084c2f6c73fdbe78
parent 3f10390ce85efda876ad72b24b231749233001c8

Merge "Don\'t go busy loop when waiting child process."
am: ae2b746c82

* commit 'ae2b746c8274845c64d2d62ddc8f3a0b07a05f35':
  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));