X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Fthr_posix.c;h=2a770f33154c26b374e9d7b32f3b8d78a21ecae6;hb=a75e57d15ae5024dfb76fefc46b113951969e8f3;hp=847e7270102d21cf112ccabcbcadfe9d7b05c0c4;hpb=cc8aa38d7ddd20c1a1fef4b5fc73d94a7b204bd4;p=openldap
diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index 847e727010..2a770f3315 100644
--- 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 .
+ *
+ * Copyright 1998-2013 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
+ * .
*/
#include "portable.h"
@@ -18,23 +20,55 @@
#include
-#include "ldap_pvt_thread.h"
+#ifdef REPLACE_BROKEN_YIELD
+#ifndef HAVE_NANOSLEEP
+#include
+#endif
+#include
+#endif
+#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 */
+#include /* For pthread_kill() */
-#if HAVE_PTHREADS_D4
+#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
+#if HAVE_PTHREADS < 7
+#define ERRVAL(val) ((val) < 0 ? errno : 0)
+#else
+#define ERRVAL(val) (val)
+#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 +78,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;
}
@@ -54,7 +91,7 @@ ldap_pvt_thread_set_concurrency(int n)
{
#ifdef HAVE_PTHREAD_SETCONCURRENCY
return pthread_setconcurrency( n );
-#elif HAVE_THR_SETCONCURRENCY
+#elif defined(HAVE_THR_SETCONCURRENCY)
return thr_setconcurrency( n );
#else
return 0;
@@ -68,7 +105,7 @@ ldap_pvt_thread_get_concurrency(void)
{
#ifdef HAVE_PTHREAD_GETCONCURRENCY
return pthread_getconcurrency();
-#elif HAVE_THR_GETCONCURRENCY
+#elif defined(HAVE_THR_GETCONCURRENCY)
return thr_getconcurrency();
#else
return 0;
@@ -76,6 +113,22 @@ ldap_pvt_thread_get_concurrency(void)
}
#endif
+/* detachstate appeared in Draft 6, but without manifest constants.
+ * in Draft 7 they were called PTHREAD_CREATE_UNDETACHED and ...DETACHED.
+ * in Draft 8 on, ...UNDETACHED became ...JOINABLE.
+ */
+#ifndef PTHREAD_CREATE_JOINABLE
+#ifdef PTHREAD_CREATE_UNDETACHED
+#define PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED
+#else
+#define PTHREAD_CREATE_JOINABLE 0
+#endif
+#endif
+
+#ifndef PTHREAD_CREATE_DETACHED
+#define PTHREAD_CREATE_DETACHED 1
+#endif
+
int
ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
int detach,
@@ -83,54 +136,47 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
void *arg)
{
int rtn;
-#if defined( HAVE_PTHREADS_FINAL )
pthread_attr_t attr;
- pthread_attr_init(&attr);
-#if defined( PTHREAD_CREATE_JOINABLE ) || defined( PTHREAD_UNDETACHED )
- if (!detach) {
-#if defined( PTHREAD_CREATE_JOINABLE )
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+/* Always create the thread attrs, so we can set stacksize if we need to */
+#if HAVE_PTHREADS > 5
+ pthread_attr_init(&attr);
#else
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_UNDETACHED);
-#endif
-#ifdef PTHREAD_CREATE_DETACHED
- } else {
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-#elif HAVE_PTHREAD_OS390
- } else {
- int st = __DETACHED;
- pthread_attr_setdetachstate(&attr, &st);
-#endif
- }
+ 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
- rtn = pthread_create( thread, &attr, start_routine, arg );
-#ifdef HAVE_PTHREAD_OS390
- if ( rtn == -1 ) rtn = errno;
+#if HAVE_PTHREADS > 5
+ detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;
+#if HAVE_PTHREADS == 6
+ pthread_attr_setdetachstate(&attr, &detach);
+#else
+ pthread_attr_setdetachstate(&attr, detach);
#endif
-
-#if !defined( PTHREAD_CREATE_JOINABLE ) && !defined( PTHREAD_UNDETACHED )
- if( detach ) {
- (void) pthread_detach( *thread );
- }
#endif
- pthread_attr_destroy(&attr);
+#if HAVE_PTHREADS < 5
+ rtn = pthread_create( thread, attr, start_routine, arg );
#else
- rtn = pthread_create( thread, LDAP_INT_THREAD_ATTR_DEFAULT,
- start_routine, arg );
+ rtn = pthread_create( thread, &attr, start_routine, arg );
+#endif
+#if HAVE_PTHREADS > 5
+ pthread_attr_destroy(&attr);
+#else
+ pthread_attr_delete(&attr);
if( detach ) {
pthread_detach( thread );
}
#endif
+#if HAVE_PTHREADS < 7
+ if ( rtn < 0 ) rtn = errno;
+#endif
return rtn;
}
@@ -143,31 +189,20 @@ ldap_pvt_thread_exit( void *retval )
int
ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
{
-#if !defined( HAVE_PTHREADS_FINAL )
+#if HAVE_PTHREADS < 7
void *dummy;
if (thread_return==NULL)
thread_return=&dummy;
-#endif
-#ifdef HAVE_PTHREAD_OS390
- int st = pthread_join( thread, thread_return );
- if ( st == -1 ) st = errno;
- return st;
-#else
- return pthread_join( thread, thread_return );
#endif
+ return ERRVAL( pthread_join( thread, thread_return ) );
}
int
ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
{
-#ifdef HAVE_PTHREAD_KILL
-#ifdef HAVE_PTHREAD_OS390
- int st = pthread_kill( thread, signo );
- if ( st == -1 ) st = errno;
- return st;
-#else
- return pthread_kill( thread, signo );
-#endif
+#if defined(HAVE_PTHREAD_KILL) && HAVE_PTHREADS > 4
+ /* MacOS 10.1 is detected as v10 but has no pthread_kill() */
+ return ERRVAL( pthread_kill( thread, signo ) );
#else
/* pthread package with DCE */
if (kill( getpid(), signo )<0)
@@ -179,88 +214,128 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
int
ldap_pvt_thread_yield( void )
{
-#ifdef _POSIX_THREAD_IS_GNU_PTH
- sched_yield();
+#ifdef REPLACE_BROKEN_YIELD
+#ifdef HAVE_NANOSLEEP
+ struct timespec t = { 0, 0 };
+ nanosleep(&t, NULL);
+#else
+ struct timeval tv = {0,0};
+ select( 0, NULL, NULL, NULL, &tv );
+#endif
return 0;
-#elif HAVE_SCHED_YIELD
+#elif defined(HAVE_THR_YIELD)
+ thr_yield();
+ return 0;
+
+#elif HAVE_PTHREADS == 10
return sched_yield();
-#elif HAVE_PTHREAD_YIELD
-#if HAVE_PTHREAD_OS390
- pthread_yield(NULL);
-#else
- pthread_yield();
-#endif
+#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;
#else
+ pthread_yield();
return 0;
-#endif
+#endif
}
int
ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
{
- return pthread_cond_init( cond, LDAP_INT_THREAD_CONDATTR_DEFAULT );
+ return ERRVAL( pthread_cond_init(
+ cond, LDAP_INT_THREAD_CONDATTR_DEFAULT ) );
}
int
ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cond )
{
- return pthread_cond_destroy( cond );
+ return ERRVAL( pthread_cond_destroy( cond ) );
}
int
ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
{
- return pthread_cond_signal( cond );
+ return ERRVAL( pthread_cond_signal( cond ) );
}
int
ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
{
- return pthread_cond_broadcast( cond );
+ return ERRVAL( pthread_cond_broadcast( cond ) );
}
int
ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_cond_wait( cond, mutex );
+ return ERRVAL( pthread_cond_wait( cond, mutex ) );
}
int
ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_mutex_init( mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT );
+ return ERRVAL( pthread_mutex_init(
+ mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT ) );
}
int
ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_mutex_destroy( mutex );
+ return ERRVAL( pthread_mutex_destroy( mutex ) );
}
int
ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_mutex_lock( mutex );
+ return ERRVAL( pthread_mutex_lock( mutex ) );
}
int
ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_mutex_trylock( mutex );
+ return ERRVAL( pthread_mutex_trylock( mutex ) );
}
int
ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
{
- return pthread_mutex_unlock( mutex );
+ return ERRVAL( pthread_mutex_unlock( mutex ) );
+}
+
+ldap_pvt_thread_t ldap_pvt_thread_self( void )
+{
+ return pthread_self();
+}
+
+int
+ldap_pvt_thread_key_create( ldap_pvt_thread_key_t *key )
+{
+ return pthread_key_create( key, NULL );
+}
+
+int
+ldap_pvt_thread_key_destroy( ldap_pvt_thread_key_t key )
+{
+ return pthread_key_delete( key );
+}
+
+int
+ldap_pvt_thread_key_setdata( ldap_pvt_thread_key_t key, void *data )
+{
+ return pthread_setspecific( key, data );
+}
+
+int
+ldap_pvt_thread_key_getdata( ldap_pvt_thread_key_t key, void **data )
+{
+ *data = pthread_getspecific( key );
+ return 0;
}
#ifdef LDAP_THREAD_HAVE_RDWR
@@ -268,46 +343,46 @@ ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
int
ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_init( rw, NULL );
+ return ERRVAL( pthread_rwlock_init( rw, NULL ) );
}
int
ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_destroy( rw );
+ return ERRVAL( pthread_rwlock_destroy( rw ) );
}
int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_rdlock( rw );
+ return ERRVAL( pthread_rwlock_rdlock( rw ) );
}
int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_tryrdlock( rw );
+ return ERRVAL( pthread_rwlock_tryrdlock( rw ) );
}
int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_unlock( rw );
+ return ERRVAL( pthread_rwlock_unlock( rw ) );
}
int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_wrlock( rw );
+ return ERRVAL( pthread_rwlock_wrlock( rw ) );
}
int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_trywrlock( rw );
+ return ERRVAL( pthread_rwlock_trywrlock( rw ) );
}
int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
{
- return pthread_rwlock_unlock( rw );
+ return ERRVAL( pthread_rwlock_unlock( rw ) );
}
-#endif /* HAVE_PTHREAD_RDLOCK_DESTROY */
+#endif /* HAVE_PTHREAD_RWLOCK_DESTROY */
#endif /* LDAP_THREAD_HAVE_RDWR */
#endif /* HAVE_PTHREADS */