commit 7b3d5c36f4e73cc6660116c177e2970c241316a0
author Keith Mok <keithmok@google.com> Sat Nov 13 04:56:36 2021 +0000
committer Keith Mok <keithmok@google.com> Thu Nov 18 00:36:39 2021 +0000
tree d02841194ae05854ed2c55a25489dbbfb271f90f
parent f70982c797feb85e72b11189d6d4057caf357ea8

Fix EINTR handling

waitid will not return EINTR from return value.
If there is signal during waitid, it will return -1
with errno set to EINTR

Test: Build ok
Change-Id: Iec31e25ff51575d6cb74e1938718313066e3c1ed

media/audioserver/main_audioserver.cpp

diff --git a/media/audioserver/main_audioserver.cpp b/media/audioserver/main_audioserver.cpp
index 8ee1efb..c5ac7f9 100644
--- a/media/audioserver/main_audioserver.cpp
+++ b/media/audioserver/main_audioserver.cpp
@@ -73,10 +73,8 @@
         IPCThreadState::self()->joinThreadPool();
         for (;;) {
             siginfo_t info;
-            int ret = waitid(P_PID, childPid, &info, WEXITED | WSTOPPED | WCONTINUED);
-            if (ret == EINTR) {
-                continue;
-            }
+            int ret = TEMP_FAILURE_RETRY(waitid(P_PID, childPid, &info,
+                                                WEXITED | WSTOPPED | WCONTINUED));
             if (ret < 0) {
                 break;
             }