commit 53c43139f0718c665f10ceb8fa76b10d53beb99c
author Mikhail Naganov <mnaganov@google.com> Fri Mar 03 09:15:01 2017 -0800
committer gitbuildkicker <android-build@google.com> Fri Mar 03 16:37:53 2017 -0800
tree 705758a12dd2b4ffd9186285efd75b354d6eb68b
parent ed7f8ec6ba0038dcd251d9df0e743dbe69ee5102

audiohal: Check for EINTR and retry when waiting for EventFlag

EINTR can be returned in the case when a futex wait has been
interrupted by a signal. We need to retry in that case.

Bug: 35813113
Change-Id: I7eaee5298f5c0bc5cd62309c3fd8349ee3eae629
Test: make
(cherry picked from commit d2ae9cd57cfbb6f2f4dd0a91dbc7ea2e9e5fc447)

media/libaudiohal/EffectHalHidl.cpp

diff --git a/media/libaudiohal/EffectHalHidl.cpp b/media/libaudiohal/EffectHalHidl.cpp
index db115ef..539558d 100644
--- a/media/libaudiohal/EffectHalHidl.cpp
+++ b/media/libaudiohal/EffectHalHidl.cpp
@@ -194,8 +194,8 @@
         }
         return analyzeResult(retval);
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;

media/libaudiohal/StreamHalHidl.cpp

diff --git a/media/libaudiohal/StreamHalHidl.cpp b/media/libaudiohal/StreamHalHidl.cpp
index 77ba716..5b06b73 100644
--- a/media/libaudiohal/StreamHalHidl.cpp
+++ b/media/libaudiohal/StreamHalHidl.cpp
@@ -360,8 +360,8 @@
         }
         return ret;
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;
@@ -620,8 +620,8 @@
         }
         return ret;
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;