/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#define LDAP_THREAD_IMPLEMENTATION
#define LDAP_THREAD_RDWR_IMPLEMENTATION
#include "ldap_thr_debug.h" /* May rename the symbols defined below */
+#include <signal.h> /* For pthread_kill() */
#if HAVE_PTHREADS < 6
# define LDAP_INT_THREAD_ATTR_DEFAULT pthread_attr_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 HAVE_PTHREAD_SETCONCURRENCY
return pthread_setconcurrency( n );
-#elif HAVE_THR_SETCONCURRENCY
+#elif defined(HAVE_THR_SETCONCURRENCY)
return thr_setconcurrency( n );
#else
return 0;
{
#ifdef HAVE_PTHREAD_GETCONCURRENCY
return pthread_getconcurrency();
-#elif HAVE_THR_GETCONCURRENCY
+#elif defined(HAVE_THR_GETCONCURRENCY)
return thr_getconcurrency();
#else
return 0;
#else
rtn = pthread_create( thread, &attr, start_routine, arg );
#endif
+
#if HAVE_PTHREADS > 5
pthread_attr_destroy(&attr);
#else
{
#if HAVE_PTHREADS < 7
void *dummy;
-
if (thread_return==NULL)
thread_return=&dummy;
-
- if ( pthread_join( thread, thread_return ) < 0 ) return errno;
- return 0;
-#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 )
{
-#if ( HAVE_PTHREAD_KILL && HAVE_PTHREADS > 6 )
+#if defined(HAVE_PTHREAD_KILL) && HAVE_PTHREADS > 4
/* MacOS 10.1 is detected as v10 but has no pthread_kill() */
- return pthread_kill( thread, signo );
-#elif ( HAVE_PTHREAD_KILL && HAVE_PTHREADS > 4 )
- if ( pthread_kill( thread, signo ) < 0 ) return errno;
- return 0;
+ return ERRVAL( pthread_kill( thread, signo ) );
#else
/* pthread package with DCE */
if (kill( getpid(), signo )<0)
select( 0, NULL, NULL, NULL, &tv );
#endif
return 0;
-#elif HAVE_THR_YIELD
+
+#elif defined(HAVE_THR_YIELD)
thr_yield();
return 0;
#elif HAVE_PTHREADS == 6
pthread_yield(NULL);
return 0;
+
#else
pthread_yield();
return 0;
int
ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_cond_init( cond, LDAP_INT_THREAD_CONDATTR_DEFAULT ) < 0 )
- return errno;
- return 0;
-#else
- return pthread_cond_init( cond, LDAP_INT_THREAD_CONDATTR_DEFAULT );
-#endif
+ return ERRVAL( pthread_cond_init(
+ cond, LDAP_INT_THREAD_CONDATTR_DEFAULT ) );
}
int
ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cond )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_cond_destroy( cond ) < 0 ) return errno;
- return 0;
-#else
- return pthread_cond_destroy( cond );
-#endif
+ return ERRVAL( pthread_cond_destroy( cond ) );
}
int
ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_cond_signal( cond ) < 0 ) return errno;
- return 0;
-#else
- return pthread_cond_signal( cond );
-#endif
+ return ERRVAL( pthread_cond_signal( cond ) );
}
int
ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_cond_broadcast( cond ) < 0 ) return errno;
- return 0;
-#else
- return pthread_cond_broadcast( cond );
-#endif
+ return ERRVAL( pthread_cond_broadcast( cond ) );
}
int
ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_cond_wait( cond, mutex ) < 0 ) return errno;
- return 0;
-#else
- return pthread_cond_wait( cond, mutex );
-#endif
+ return ERRVAL( pthread_cond_wait( cond, mutex ) );
}
int
ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_mutex_init( mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT )<0)
- return errno;
- return 0;
-#else
- return pthread_mutex_init( mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT );
-#endif
+ return ERRVAL( pthread_mutex_init(
+ mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT ) );
}
int
ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_mutex_destroy( mutex ) < 0 ) return errno;
- return 0;
-#else
- return pthread_mutex_destroy( mutex );
-#endif
+ return ERRVAL( pthread_mutex_destroy( mutex ) );
}
int
ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_mutex_lock( mutex ) < 0 ) return errno;
- return 0;
-#else
- return pthread_mutex_lock( mutex );
-#endif
+ return ERRVAL( pthread_mutex_lock( mutex ) );
}
int
ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_mutex_trylock( mutex ) < 0 ) return errno;
- return 0;
-#else
- return pthread_mutex_trylock( mutex );
-#endif
+ return ERRVAL( pthread_mutex_trylock( mutex ) );
}
int
ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_mutex_unlock( mutex ) < 0 ) return errno;
- return 0;
-#else
- return pthread_mutex_unlock( mutex );
-#endif
+ 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
#ifdef HAVE_PTHREAD_RWLOCK_DESTROY
int
ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_init( rw, NULL ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_init( rw, NULL );
-#endif
+ return ERRVAL( pthread_rwlock_init( rw, NULL ) );
}
int
ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_destroy( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_destroy( rw );
-#endif
+ return ERRVAL( pthread_rwlock_destroy( rw ) );
}
int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_rdlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_rdlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_rdlock( rw ) );
}
int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_tryrdlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_tryrdlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_tryrdlock( rw ) );
}
int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_unlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_unlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_unlock( rw ) );
}
int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_wrlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_wrlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_wrlock( rw ) );
}
int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_trywrlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_trywrlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_trywrlock( rw ) );
}
int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
{
-#if HAVE_PTHREADS < 7
- if ( pthread_rwlock_unlock( rw ) < 0 ) return errno;
- return 0;
-#else
- return pthread_rwlock_unlock( rw );
-#endif
+ return ERRVAL( pthread_rwlock_unlock( rw ) );
}
#endif /* HAVE_PTHREAD_RWLOCK_DESTROY */
projects / openldap / blobdiff