ITS#619: TLS PRNG initialization code

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 7d818c4b09e46a907c63dae8aa49c4b60b978852..da0a3fcdf07698b39ec2552b7f68c1a2f8c03a22 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -22,156 +22,144 @@ typedef ldap_int_thread_t ldap_pvt_thread_t;
 typedef ldap_int_thread_mutex_t ldap_pvt_thread_mutex_t;
 typedef ldap_int_thread_cond_t ldap_pvt_thread_cond_t;
 
-
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_initialize LDAP_P(( void ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_destroy LDAP_P(( void ));
 
-LIBLDAP_F( unsigned int )
+LDAP_F( unsigned int )
 ldap_pvt_thread_sleep LDAP_P(( unsigned int s ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_get_concurrency LDAP_P(( void ));
 
-#ifndef LDAP_THREAD_CONCURRENCY
-       /* three concurrent threads should be enough */
-#define LDAP_THREAD_CONCURRENCY        3
-#endif
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 
 #define LDAP_PVT_THREAD_CREATE_JOINABLE 0
 #define LDAP_PVT_THREAD_CREATE_DETACHED 1
 
-LIBLDAP_F( int ) 
+LDAP_F( int ) 
 ldap_pvt_thread_create LDAP_P((
        ldap_pvt_thread_t * thread, 
        int     detach,
        void *(*start_routine)( void * ), 
        void *arg));
 
-LIBLDAP_F( void ) 
+LDAP_F( void ) 
 ldap_pvt_thread_exit LDAP_P(( void *retval ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_join LDAP_P(( ldap_pvt_thread_t thread, void **status ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_kill LDAP_P(( ldap_pvt_thread_t thread, int signo ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_yield LDAP_P(( void ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_cond_init LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_cond_destroy LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_cond_signal LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_cond_broadcast LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_cond_wait LDAP_P((
        ldap_pvt_thread_cond_t *cond, 
        ldap_pvt_thread_mutex_t *mutex ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_mutex_init LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_mutex_destroy LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_mutex_trylock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
 #ifndef LDAP_THREAD_HAVE_RDWR
-typedef struct ldap_pvt_thread_rdwr_var {
-       ldap_pvt_thread_mutex_t ltrw_mutex;     
-       ldap_pvt_thread_cond_t ltrw_read;       /* wait for read */
-       ldap_pvt_thread_cond_t ltrw_write;      /* wait for write */
-       int ltrw_valid;
-#define LDAP_PVT_THREAD_RDWR_VALID 0x0bad
-       int ltrw_r_active;
-       int ltrw_w_active;
-       int ltrw_r_wait;
-       int ltrw_w_wait;
-} ldap_pvt_thread_rdwr_t;
+typedef struct ldap_int_thread_rdwr_s * ldap_pvt_thread_rdwr_t;
 #endif
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_destroy LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_rlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_rtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_runlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wunlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
 #ifdef LDAP_DEBUG
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_readers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_writers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_rdwr_active LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 #endif /* LDAP_DEBUG */
 
 #define LDAP_PVT_THREAD_EINVAL EINVAL
 #define LDAP_PVT_THREAD_EBUSY EINVAL
 
+typedef ldap_int_thread_pool_t ldap_pvt_thread_pool_t;
 
-typedef struct t_ldap_pvt_thread_pool *ldap_pvt_thread_pool_t;
-
+LDAP_F( int )
+ldap_pvt_thread_pool_init LDAP_P((
+       ldap_pvt_thread_pool_t *pool_out,
+       int max_threads,
+       int max_pending ));
 
-LIBLDAP_F( int )
-ldap_pvt_thread_pool_initialize LDAP_P((
-                                               ldap_pvt_thread_pool_t *pool_out,
-                                               int max_concurrency,
-                                               int max_pending ));
-
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_pool_submit LDAP_P((
-                                               ldap_pvt_thread_pool_t pool,
-                                               void *(*start_routine)( void * ),
-                                               void *arg ));
+       ldap_pvt_thread_pool_t *pool,
+       void *(*start_routine)( void * ),
+       void *arg ));
+
+LDAP_F( int )
+ldap_pvt_thread_pool_maxthreads LDAP_P((
+       ldap_pvt_thread_pool_t *pool,
+       int max_threads ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_pool_backload LDAP_P((
-                                               ldap_pvt_thread_pool_t pool ));
+       ldap_pvt_thread_pool_t *pool ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_thread_pool_destroy LDAP_P((
-                                               ldap_pvt_thread_pool_t pool,
-                                               int run_pending ));
+       ldap_pvt_thread_pool_t *pool,
+       int run_pending ));
 
 
 LDAP_END_DECL