Only set URANDOM_DEVICE if undef

[openldap] / libraries / libldap_r / threads.c

diff --git a/libraries/libldap_r/threads.c b/libraries/libldap_r/threads.c
index 74ce67c2d39b2e56f25b21488e5842308633813f..3ac48498e7ac9c44f96473d357efc03e7b68cca4 100644 (file)
--- a/libraries/libldap_r/threads.c
+++ b/libraries/libldap_r/threads.c
@@ -11,133 +11,77 @@
 
 #include "portable.h"
 
-#include "ldap_int_thread.h"
-#include "ldap_pvt_thread.h"
-
-LIBLDAP_F( int )
-ldap_pvt_thread_initialize ( void )
-{
-       return ldap_int_thread_initialize();
-}
-
-LIBLDAP_F( int )
-ldap_pvt_thread_destroy ( void )
-{
-       return ldap_int_thread_destroy();
-}
-
-LIBLDAP_F( int )
-ldap_pvt_thread_get_concurrency ( void )
-{
-#ifdef HAVE_GETCONCURRENCY
-       return ldap_int_thread_get_concurrency();
-#else
-       return 1;
-#endif
-}
+#include <stdio.h>
+#include <stdarg.h>
 
-LIBLDAP_F( int )
-ldap_pvt_thread_set_concurrency ( int concurrency )
-{
-#ifdef HAVE_SETCONCURRENCY
-       return ldap_int_thread_set_concurrency(concurrency);
-#else
-       return 1;
-#endif
-}
-
-LIBLDAP_F( int ) 
-ldap_pvt_thread_create (
-       ldap_pvt_thread_t * thread, 
-       int     detach,
-       void *(*start_routine)( void * ), 
-       void *arg)
-{
-       return ldap_int_thread_create(thread, detach, start_routine, arg);
-}
-
-LIBLDAP_F( void ) 
-ldap_pvt_thread_exit ( void *retval )
-{
-       ldap_int_thread_exit(retval);
-}
+#include <ac/stdlib.h>
+#include <ac/string.h>
 
-LIBLDAP_F( int )
-ldap_pvt_thread_join ( ldap_pvt_thread_t thread, void **status )
-{
-       return ldap_int_thread_join(thread, status);
-}
+#include "ldap_pvt_thread.h"
 
-LIBLDAP_F( int )
-ldap_pvt_thread_kill ( ldap_pvt_thread_t thread, int signo )
-{
-       return ldap_int_thread_kill(thread, signo);
-}
 
-LIBLDAP_F( int )
-ldap_pvt_thread_yield ( void )
-{
-       return ldap_int_thread_yield();
-}
+/*
+ * Common LDAP thread routines
+ *     see thr_*.c for implementation specific routines
+ *     see rdwr.c for generic reader/writer lock implementation
+ *     see tpool.c for generic thread pool implementation
+ */
 
-LIBLDAP_F( int )
-ldap_pvt_thread_cond_init ( ldap_pvt_thread_cond_t *cond )
-{
-       return ldap_int_thread_cond_init(cond);
-}
 
-LIBLDAP_F( int )
-ldap_pvt_thread_cond_destroy ( ldap_pvt_thread_cond_t *cond )
+int ldap_pvt_thread_initialize( void )
 {
-       return ldap_int_thread_cond_destroy(cond);
-}
+       int rc;
+       static int init = 0;
 
-LIBLDAP_F( int )
-ldap_pvt_thread_cond_signal ( ldap_pvt_thread_cond_t *cond )
-{
-       return ldap_int_thread_cond_signal(cond);
-}
+       /* we only get one shot at this */
+       if( init++ ) return -1;
 
-LIBLDAP_F( int )
-ldap_pvt_thread_cond_broadcast ( ldap_pvt_thread_cond_t *cond )
-{
-       return ldap_int_thread_cond_broadcast(cond);
-}
+       rc = ldap_int_thread_initialize();
+       if( rc ) return rc;
 
-LIBLDAP_F( int )
-ldap_pvt_thread_cond_wait (
-       ldap_pvt_thread_cond_t *cond, 
-       ldap_pvt_thread_mutex_t *mutex )
-{
-       return ldap_int_thread_cond_wait(cond, mutex);
-}
+#ifndef LDAP_THREAD_HAVE_TPOOL
+       rc = ldap_int_thread_pool_startup();
+       if( rc ) return rc;
+#endif
 
-LIBLDAP_F( int )
-ldap_pvt_thread_mutex_init ( ldap_pvt_thread_mutex_t *mutex )
-{
-       return ldap_int_thread_mutex_init(mutex);
+       return 0;
 }
 
-LIBLDAP_F( int )
-ldap_pvt_thread_mutex_destroy ( ldap_pvt_thread_mutex_t *mutex )
+int ldap_pvt_thread_destroy( void )
 {
-       return ldap_int_thread_mutex_destroy(mutex);
+#ifndef LDAP_THREAD_HAVE_TPOOL
+       (void) ldap_int_thread_pool_shutdown();
+#endif
+       return ldap_int_thread_destroy();
 }
 
-LIBLDAP_F( int )
-ldap_pvt_thread_mutex_lock ( ldap_pvt_thread_mutex_t *mutex )
+#ifndef LDAP_THREAD_HAVE_GETCONCURRENCY
+int
+ldap_pvt_thread_get_concurrency ( void )
 {
-       return ldap_int_thread_mutex_lock(mutex);
+       return 1;
 }
+#endif
 
-LIBLDAP_F( int )
-ldap_pvt_thread_mutex_trylock ( ldap_pvt_thread_mutex_t *mutex )
+#ifndef LDAP_THREAD_HAVE_SETCONCURRENCY
+int
+ldap_pvt_thread_set_concurrency ( int concurrency )
 {
-       return ldap_int_thread_mutex_trylock(mutex);
+       return 1;
 }
+#endif
 
-LIBLDAP_F( int )
-ldap_pvt_thread_mutex_unlock ( ldap_pvt_thread_mutex_t *mutex )
+#ifndef LDAP_THREAD_HAVE_SLEEP
+/*
+ * Here we assume we have fully preemptive threads and that sleep()
+ * does the right thing.
+ */
+unsigned int
+ldap_pvt_thread_sleep(
+       unsigned int interval
+)
 {
-       return ldap_int_thread_mutex_unlock(mutex);
+       sleep( interval );
+       return 0;
 }
+#endif