generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 03335d91: am 136e7f2b: am 611b903c: Merge "Properly detect timeout in pthread_mutex_lock_timeout_np_impl"

Browse Source 
* commit '03335d91248aaf4c70a126fbf80481a924c4588b':
  Properly detect timeout in pthread_mutex_lock_timeout_np_impl
This commit is contained in:
Elliott Hughes
2013-12-18 18:09:26 +00:00
committed by Android Git Automerger
parent 977d4e0dc6 03335d9124
commit 67a5d0a429
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/pthread_mutex.cpp
View File

@@ -783,7 +783,7 @@ int pthread_mutex_lock_timeout_np_impl(pthread_mutex_t *mutex, unsigned msecs)
* 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;