diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-09-06 19:22:54 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-09-06 19:22:54 +0000 |
| commit | 75833f08cd845632e2706cdbcc1df86607f73117 (patch) | |
| tree | 693bb99e2d9c2f75a991fe1dd3cc1b7f0b246b17 /winsup/cygwin/thread.cc | |
| parent | 5843726e51e0cc7463e6c271febe5b40025b9b6e (diff) | |
| download | cygnal-75833f08cd845632e2706cdbcc1df86607f73117.tar.gz cygnal-75833f08cd845632e2706cdbcc1df86607f73117.tar.bz2 cygnal-75833f08cd845632e2706cdbcc1df86607f73117.zip | |
* thread.h: Revert patch from 2005-09-05.
* thread.cc (pthread_mutex::can_be_unlocked): Return true also if
mutex is owned by MUTEX_OWNER_ANONYMOUS.
Diffstat (limited to 'winsup/cygwin/thread.cc')
| -rw-r--r-- | winsup/cygwin/thread.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index 9f4899e91..11d60fc0e 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -212,10 +212,11 @@ pthread_mutex::can_be_unlocked (pthread_mutex_t const *mutex) if (!is_good_object (mutex)) return false; - /* - * Check if the mutex is owned by the current thread and can be unlocked - */ - return ((*mutex)->recursion_counter == 1 && pthread::equal ((*mutex)->owner, self)); + /* Check if the mutex is owned by the current thread and can be unlocked. + * Also check for the ANONYMOUS owner to cover NORMAL mutexes as well. */ + return ((*mutex)->recursion_counter == 1 + && ((*mutex)->owner == MUTEX_OWNER_ANONYMOUS + || pthread::equal ((*mutex)->owner, self))); } inline bool |