More for ITS#7749

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index e8a8b08dbfd777a4f1d029b417816bb9a592c85d..52d048af9a2269c8bc7fe58fe024c93098c70fde 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,10 +28,14 @@ typedef ldap_int_thread_t                   ldap_pvt_thread_t;
 typedef ldap_debug_thread_mutex_t      ldap_pvt_thread_mutex_t;
 typedef ldap_debug_thread_cond_t       ldap_pvt_thread_cond_t;
 typedef ldap_debug_thread_rdwr_t       ldap_pvt_thread_rdwr_t;
+#define LDAP_PVT_MUTEX_FIRSTCREATE     LDAP_DEBUG_MUTEX_FIRSTCREATE
+#define LDAP_PVT_MUTEX_NULL                    LDAP_DEBUG_MUTEX_NULL
 #else
 typedef ldap_int_thread_mutex_t                ldap_pvt_thread_mutex_t;
 typedef ldap_int_thread_cond_t         ldap_pvt_thread_cond_t;
 typedef ldap_int_thread_rdwr_t         ldap_pvt_thread_rdwr_t;
+#define LDAP_PVT_MUTEX_FIRSTCREATE     LDAP_INT_MUTEX_FIRSTCREATE
+#define LDAP_PVT_MUTEX_NULL                    LDAP_INT_MUTEX_NULL
 #endif
 typedef ldap_int_thread_rmutex_t       ldap_pvt_thread_rmutex_t;
 typedef ldap_int_thread_key_t  ldap_pvt_thread_key_t;
@@ -59,12 +63,12 @@ ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 
 #ifndef LDAP_PVT_THREAD_H_DONE
 #define        LDAP_PVT_THREAD_SET_STACK_SIZE
-#ifndef LDAP_PVT_THREAD_STACK_SIZE
+/* The size may be explicitly #defined to zero to disable it. */
+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
+#      undef LDAP_PVT_THREAD_SET_STACK_SIZE
+#elif !defined( LDAP_PVT_THREAD_STACK_SIZE )
        /* LARGE stack. Will be twice as large on 64 bit machine. */
-#define LDAP_PVT_THREAD_STACK_SIZE     ( 1 * 1024 * 1024 * sizeof(void *) )
-/* May be explicitly defined to zero to disable it */
-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
-#undef LDAP_PVT_THREAD_SET_STACK_SIZE
+#      define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
 #endif
 #endif /* !LDAP_PVT_THREAD_H_DONE */
 
@@ -215,6 +219,12 @@ ldap_pvt_thread_pool_submit LDAP_P((
        ldap_pvt_thread_start_t *start,
        void *arg ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_retract LDAP_P((
+       ldap_pvt_thread_pool_t *pool,
+       ldap_pvt_thread_start_t *start,
+       void *arg ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_maxthreads LDAP_P((
        ldap_pvt_thread_pool_t *pool,
@@ -243,10 +253,26 @@ ldap_pvt_thread_pool_query LDAP_P((
        ldap_pvt_thread_pool_t *pool,
        ldap_pvt_thread_pool_param_t param, void *value ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_pausing LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_backload LDAP_P((
        ldap_pvt_thread_pool_t *pool ));
 
+LDAP_F( void )
+ldap_pvt_thread_pool_idle LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
+LDAP_F( void )
+ldap_pvt_thread_pool_unidle LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
+LDAP_F( int )
+ldap_pvt_thread_pool_pausecheck LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_pause LDAP_P((
        ldap_pvt_thread_pool_t *pool ));
@@ -268,7 +294,7 @@ ldap_pvt_thread_pool_getkey LDAP_P((
        ldap_pvt_thread_pool_keyfree_t **kfree ));
 
 LDAP_F( int )
-ldap_pvt_thread_pool_setkey_x LDAP_P((
+ldap_pvt_thread_pool_setkey LDAP_P((
        void *ctx,
        void *key,
        void *data,
@@ -276,9 +302,6 @@ ldap_pvt_thread_pool_setkey_x LDAP_P((
        void **olddatap,
        ldap_pvt_thread_pool_keyfree_t **oldkfreep ));
 
-#define ldap_pvt_thread_pool_setkey( ctx, key, data, kfree ) \
-       ldap_pvt_thread_pool_setkey_x( (ctx), (key), (data), (kfree), NULL, NULL )
-
 LDAP_F( void )
 ldap_pvt_thread_pool_purgekey LDAP_P(( void *key ));