diff options
author | Chris Ball <cball@fmco.com> | 1999-09-29 00:37:49 +0000 |
---|---|---|
committer | Ovidiu Predescu <ovidiu@gcc.gnu.org> | 1999-09-29 00:37:49 +0000 |
commit | 224a6bca72f55814fda63e6ffdd051611ae6c9d4 (patch) | |
tree | ad4339b76e285ab19d6102f0c2f74853669cd952 | |
parent | ab31268c62837c1d45d7fa6e332170129fa3aa05 (diff) | |
download | gcc-224a6bca72f55814fda63e6ffdd051611ae6c9d4.zip gcc-224a6bca72f55814fda63e6ffdd051611ae6c9d4.tar.gz gcc-224a6bca72f55814fda63e6ffdd051611ae6c9d4.tar.bz2 |
Fixed deallocation of a mutex in thr-single.c (patch from Chris Ball <cball@fmco.com>).
From-SVN: r29701
-rw-r--r-- | libobjc/ChangeLog | 4 | ||||
-rw-r--r-- | libobjc/thr-posix.c | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b292188..8ded893 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 23 07:19:12 1999 Chris Ball <cball@fmco.com> + + * thr-posix.c (__objc_mutex_deallocate): made deallocate work. + Tue Sep 21 07:47:10 1999 Jeffrey A Law (law@cygnus.com) * Makefile.in (gc.o, gc_gc.o): Do not pass -fgnu-runtime to diff --git a/libobjc/thr-posix.c b/libobjc/thr-posix.c index 5b40f71..a73c627 100644 --- a/libobjc/thr-posix.c +++ b/libobjc/thr-posix.c @@ -145,6 +145,20 @@ __objc_mutex_allocate(objc_mutex_t mutex) int __objc_mutex_deallocate(objc_mutex_t mutex) { + int count = 1; + + /* + * Posix Threads specifically require that the thread be unlocked for + * pthread_mutex_destroy to work. + */ + + while ( count ) + { + if (( count = pthread_mutex_unlock((pthread_mutex_t *)mutex->backend)) + < 0 ) + return -1; + } + if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend)) return -1; |