commit 4fae14f3335375714be3104742fa69fe65b02001
author Ken Mixter <kmixter@google.com> Tue Dec 17 12:40:08 2013 -0800
committer Ken Mixter <kmixter@google.com> Tue Dec 17 14:26:01 2013 -0800
tree bdf4e9cd74914f6b6a506ee1a65ac0634a556f73
parent 3377165387d455d4cb56807a9c02cd2ece6cb24b

Properly detect timeout in pthread_mutex_lock_timeout_np_impl

Previously we were checking against a positive errno which
would not be returned from a system call.

Change-Id: I8e3a36f6fbf5ccc2191a152a1def37e2d6f93124

libc/bionic/pthread_mutex.cpp

diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
index 1010f11..4a11747 100644
--- a/libc/bionic/pthread_mutex.cpp
+++ b/libc/bionic/pthread_mutex.cpp
@@ -800,7 +800,7 @@
          * thread.
          */
         if (MUTEX_STATE_BITS_IS_LOCKED_CONTENDED(mvalue)) {
-            if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == ETIMEDOUT) {
+            if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == (-ETIMEDOUT)) {
                 return EBUSY;
             }
             mvalue = mutex->value;