add goo for error checking mutexes on (at least) tru64

diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index 3e79d1f2ba041f9c11e2b9a8a0fb33f7c5f6cac0..45ba22776c2553982a7c1c37c292b4ff7fdb3cbb 100644 (file)
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.23 2001/01/09 21:58:07 bwelling Exp $ */
+/* $Id: mutex.h,v 1.24 2002/09/08 18:32:38 explorer Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
@@ -65,10 +65,15 @@ typedef pthread_mutex_t     isc_mutex_t;
 #define isc_mutex_init(mp) \
        isc_mutex_init_profile((mp), __FILE__, __LINE__)
 #else
+#if ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK)
+#define isc_mutex_init(mp) \
+        isc_mutex_init_errcheck((mp))
+#else
 #define isc_mutex_init(mp) \
        ((pthread_mutex_init((mp), ISC__MUTEX_ATTRS) == 0) ? \
         ISC_R_SUCCESS : ISC_R_UNEXPECTED)
 #endif
+#endif
 
 #if ISC_MUTEX_PROFILE
 #define isc_mutex_lock(mp) \
@@ -126,6 +131,9 @@ isc_mutex_unlock_profile(isc_mutex_t *mp, const char * _file, int _line);
 void
 isc_mutex_statsprofile(FILE *fp);
 
+isc_result_t
+isc_mutex_init_errcheck(isc_mutex_t *mp);
+
 #endif /* ISC_MUTEX_PROFILE */
 
 #endif /* ISC_MUTEX_H */

diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index c6b6af0d019bf7105e576c73b0483db8f2970db9..cd5dbcd756a4b955e9cbbfed014f947a98ac892b 100644 (file)
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.c,v 1.6 2001/01/09 21:58:01 bwelling Exp $ */
+/* $Id: mutex.c,v 1.7 2002/09/08 18:32:38 explorer Exp $ */
 
 #include <config.h>
 
@@ -214,6 +214,25 @@ isc_mutex_statsprofile(FILE *fp) {
 
 #endif /* ISC_MUTEX_PROFILE */
 
+#if ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK)
+isc_result_t
+isc_mutex_init_errcheck(isc_mutex_t *mp)
+{
+       pthread_mutexattr_t attr;
+
+       if (pthread_mutexattr_init(&attr) != 0)
+               return ISC_R_UNEXPECTED;
+
+       if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK) != 0)
+               return ISC_R_UNEXPECTED;
+  
+       if (pthread_mutex_init(mp, &attr) != 0)
+               return ISC_R_UNEXPECTED;
+
+       return ISC_R_SUCCESS;
+}
+#endif
+
 #if ISC_MUTEX_DEBUG && defined(__NetBSD__) && defined(PTHREAD_MUTEX_ERRORCHECK)
 pthread_mutexattr_t isc__mutex_attrs = {
        PTHREAD_MUTEX_ERRORCHECK,       /* m_type */