commit 79d44a96da0c741777b36be5c06eca5b8e357c3a
author Vladimir Marko <vmarko@google.com> Wed Jul 06 12:20:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 06 12:20:11 2016 +0000
tree 35e9d4fa0cf1ab3131f425772105de4f6fe2a184
parent 25c522cfeab396f760d44754034611029097c263
parent 94aaec95445ac06ed5ec065a7e21ddd752652cee

Merge \"Expect spurious wake-up from futex(2)/FUTEX_WAIT call.\"
am: 94aaec9544

Change-Id: Ib4d8108456da7b765ad5a3a081d798f9917d7b73

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index abbe509..61e9d43 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -614,11 +614,7 @@
             PLOG(FATAL) << "futex wait failed for SuspendAllInternal()";
           }
         }
-      } else {
-        cur_val = pending_threads.LoadRelaxed();
-        CHECK_EQ(cur_val, 0);
-        break;
-      }
+      }  // else re-check pending_threads in the next iteration (this may be a spurious wake-up).
 #else
       // Spin wait. This is likely to be slow, but on most architecture ART_USE_FUTEXES is set.
 #endif