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

Properly detect timeout in pthread_mutex_lock_timeout_np_impl

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

Change-Id: I8e3a36f6fbf5ccc2191a152a1def37e2d6f93124
This commit is contained in:
Ken Mixter 2013-12-17 12:40:08 -08:00
parent 3377165387
commit 4fae14f333
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/pthread_mutex.cpp
View File

@ -800,7 +800,7 @@ int pthread_mutex_lock_timeout_np_impl(pthread_mutex_t *mutex, unsigned msecs)
* thread. * thread.
*/ */
if (MUTEX_STATE_BITS_IS_LOCKED_CONTENDED(mvalue)) { 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; return EBUSY;
} }
mvalue = mutex->value; mvalue = mutex->value;