commit f05ccaf2cc9882e8b2d0add30072fd2648bea88d
author Mathieu Chartier <mathieuc@google.com> Tue Nov 22 19:26:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 22 19:26:10 2016 +0000
tree c92854218ee522a99c298d6f32a45327c14626dc
parent c394d0558de9afff6ab8b87ae9706497e01f37ff
parent 6f4d102e0c3029b3c74af13d3846a14e1c878a12

Merge "Correctly handle EINTR return from futex"

runtime/base/mutex.cc

diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc
index 0970abd..e8ef69f 100644
--- a/runtime/base/mutex.cc
+++ b/runtime/base/mutex.cc
@@ -672,7 +672,7 @@
   ScopedContentionRecorder scr(this, GetExclusiveOwnerTid(), SafeGetTid(self));
   ++num_pending_readers_;
   if (futex(state_.Address(), FUTEX_WAIT, cur_state, nullptr, nullptr, 0) != 0) {
-    if (errno != EAGAIN) {
+    if (errno != EAGAIN && errno != EINTR) {
       PLOG(FATAL) << "futex wait failed for " << name_;
     }
   }
@@ -796,7 +796,7 @@
                    reinterpret_cast<const timespec*>(std::numeric_limits<int32_t>::max()),
                    guard_.state_.Address(), cur_sequence) != -1;
       if (!done) {
-        if (errno != EAGAIN) {
+        if (errno != EAGAIN && errno != EINTR) {
           PLOG(FATAL) << "futex cmp requeue failed for " << name_;
         }
       }