ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

Browse source 
* commit '451dd85fb204b5015c461eabc78722abd1c4252a':
  liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
This commit is contained in:
Rom Lemarchand 2013-03-12 23:12:16 +00:00 • committed by Android Git Automerger
commit 914b65fcb9
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logwrapper/logwrap.c
View file

@ -79,9 +79,7 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid,
pthread_sigmask(SIG_UNBLOCK, &chldset, NULL);
while (!found_child) {
if (poll(poll_fds, remote_hung ? 1 : 2, -1) < 0) {
if (errno == EINTR)
continue;
if (TEMP_FAILURE_RETRY(poll(poll_fds, remote_hung ? 1 : 2, -1)) < 0) {
ERROR("poll failed\n");
rc = -1;
goto err_poll;
@ -132,9 +130,7 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid,
read(signal_fd, tmp, sizeof(tmp));
while (!found_child) {
do {
ret = waitpid(-1, &status, WNOHANG);
} while (ret < 0 && errno == EINTR);
ret = TEMP_FAILURE_RETRY(waitpid(-1, &status, WNOHANG));
if (ret <= 0)
break;