Happy new year!

[openldap] / libraries / libldap_r / thr_posix.c

diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index a2812302915c15f3b1f9aaa90cf2a9a0fe0d39c6..2a05236399b3df2c4a324dcb243abf778c94b9fa 100644 (file)
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -1,15 +1,17 @@
+/* thr_posix.c - wrapper around posix and posixish thread implementations.  */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
- */
-
-/* thr_posix.c - wrapper around posix and posixish thread implementations.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -18,23 +20,41 @@
 
 #include <ac/errno.h>
 
-#include "ldap_pvt_thread.h"
-
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#define LDAP_THREAD_RDWR_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
 
-#if HAVE_PTHREADS == 4
+#if HAVE_PTHREADS < 6
 #  define LDAP_INT_THREAD_ATTR_DEFAULT         pthread_attr_default
 #  define LDAP_INT_THREAD_CONDATTR_DEFAULT     pthread_condattr_default
 #  define LDAP_INT_THREAD_MUTEXATTR_DEFAULT    pthread_mutexattr_default
 #else
 #  define LDAP_INT_THREAD_ATTR_DEFAULT         NULL
 #  define LDAP_INT_THREAD_CONDATTR_DEFAULT     NULL
-#  define LDAP_INT_THREAD_MUTEXATTR_DEFAULT    NULL
+#  define LDAP_INT_THREAD_MUTEXATTR_DEFAULT NULL
 #endif
 
+#ifdef LDAP_THREAD_DEBUG
+#  if defined LDAP_INT_THREAD_MUTEXATTR        /* May be defined in CPPFLAGS */
+#  elif defined HAVE_PTHREAD_KILL_OTHER_THREADS_NP
+        /* LinuxThreads hack */
+#    define LDAP_INT_THREAD_MUTEXATTR  PTHREAD_MUTEX_ERRORCHECK_NP
+#  else
+#    define LDAP_INT_THREAD_MUTEXATTR  PTHREAD_MUTEX_ERRORCHECK
+#  endif
+static pthread_mutexattr_t mutex_attr;
+#  undef  LDAP_INT_THREAD_MUTEXATTR_DEFAULT
+#  define LDAP_INT_THREAD_MUTEXATTR_DEFAULT &mutex_attr
+#endif
 
 int
 ldap_int_thread_initialize( void )
 {
+#ifdef LDAP_INT_THREAD_MUTEXATTR
+       pthread_mutexattr_init( &mutex_attr );
+       pthread_mutexattr_settype( &mutex_attr, LDAP_INT_THREAD_MUTEXATTR );
+#endif
        return 0;
 }
 
@@ -44,6 +64,9 @@ ldap_int_thread_destroy( void )
 #ifdef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
        /* LinuxThreads: kill clones */
        pthread_kill_other_threads_np();
+#endif
+#ifdef LDAP_INT_THREAD_MUTEXATTR
+       pthread_mutexattr_destroy( &mutex_attr );
 #endif
        return 0;
 }
@@ -102,13 +125,13 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
        pthread_attr_t attr;
 
 /* Always create the thread attrs, so we can set stacksize if we need to */
-#if HAVE_PTHREADS > 4
+#if HAVE_PTHREADS > 5
        pthread_attr_init(&attr);
 #else
        pthread_attr_create(&attr);
 #endif
 
-#if defined(LDAP_PVT_THREAD_STACK_SIZE) && LDAP_PVT_THREAD_STACK_SIZE > 0
+#ifdef LDAP_PVT_THREAD_SET_STACK_SIZE
        /* this should be tunable */
        pthread_attr_setstacksize( &attr, LDAP_PVT_THREAD_STACK_SIZE );
 #endif
@@ -121,13 +144,16 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
        pthread_attr_setdetachstate(&attr, detach);
 #endif
 #endif
+
+#if HAVE_PTHREADS < 5
+       rtn = pthread_create( thread, attr, start_routine, arg );
+#else
        rtn = pthread_create( thread, &attr, start_routine, arg );
-#if HAVE_PTHREADS > 4
+#endif
+#if HAVE_PTHREADS > 5
        pthread_attr_destroy(&attr);
 #else
        pthread_attr_delete(&attr);
-#endif
-#if HAVE_PTHREADS < 6
        if( detach ) {
                pthread_detach( thread );
        }
@@ -164,9 +190,10 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 int 
 ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 {
-#if HAVE_PTHREADS > 6
+#if ( HAVE_PTHREAD_KILL && HAVE_PTHREADS > 6 )
+       /* MacOS 10.1 is detected as v10 but has no pthread_kill() */
        return pthread_kill( thread, signo );
-#elif HAVE_PTHREADS > 4
+#elif ( HAVE_PTHREAD_KILL && HAVE_PTHREADS > 4 )
        if ( pthread_kill( thread, signo ) < 0 ) return errno;
        return 0;
 #else
@@ -180,16 +207,16 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
-#if HAVE_PTHREADS == 10
+#if HAVE_THR_YIELD
+       return thr_yield();
+
+#elif HAVE_PTHREADS == 10
        return sched_yield();
 
 #elif defined(_POSIX_THREAD_IS_GNU_PTH)
        sched_yield();
        return 0;
 
-#elif HAVE_THR_YIELD
-       return thr_yield();
-
 #elif HAVE_PTHREADS == 6
        pthread_yield(NULL);
        return 0;
@@ -312,6 +339,11 @@ ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
 #endif
 }
 
+ldap_pvt_thread_t ldap_pvt_thread_self( void )
+{
+       return pthread_self();
+}
+
 #ifdef LDAP_THREAD_HAVE_RDWR
 #ifdef HAVE_PTHREAD_RWLOCK_DESTROY
 int 
@@ -396,7 +428,7 @@ int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
 #endif
 }
 
-#endif /* HAVE_PTHREAD_RDLOCK_DESTROY */
+#endif /* HAVE_PTHREAD_RWLOCK_DESTROY */
 #endif /* LDAP_THREAD_HAVE_RDWR */
 #endif /* HAVE_PTHREADS */