X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_pvt_thread.h;h=e8a8b08dbfd777a4f1d029b417816bb9a592c85d;hb=342cf0773ba0a9235c39a0b03f2b32e8f2c7fafd;hp=ddc0302a83cf12cfdf58afb91760e6d024df3699;hpb=3c5068bc1fa84fc5daf1e50d4f1a929cec91b7e9;p=openldap

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index ddc0302a83..e8a8b08dbf 100644
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -34,13 +34,9 @@ typedef ldap_int_thread_cond_t		ldap_pvt_thread_cond_t;
 typedef ldap_int_thread_rdwr_t		ldap_pvt_thread_rdwr_t;
 #endif
 typedef ldap_int_thread_rmutex_t	ldap_pvt_thread_rmutex_t;
+typedef ldap_int_thread_key_t	ldap_pvt_thread_key_t;
 #endif /* !LDAP_PVT_THREAD_H_DONE */
 
-#if 0 && defined(LDAP_DEVEL)
-/* must also be defined in slapd.h */
-#define LDAP_PVT_THREAD_POOL_SEM_LOAD_CONTROL
-#endif
-
 #define ldap_pvt_thread_equal		ldap_int_thread_equal
 
 LDAP_F( int )
@@ -174,6 +170,18 @@ ldap_pvt_thread_rdwr_wtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 LDAP_F( int )
 ldap_pvt_thread_rdwr_wunlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
+LDAP_F( int )
+ldap_pvt_thread_key_create LDAP_P((ldap_pvt_thread_key_t *keyp));
+
+LDAP_F( int )
+ldap_pvt_thread_key_destroy LDAP_P((ldap_pvt_thread_key_t key));
+
+LDAP_F( int )
+ldap_pvt_thread_key_setdata LDAP_P((ldap_pvt_thread_key_t key, void *data));
+
+LDAP_F( int )
+ldap_pvt_thread_key_getdata LDAP_P((ldap_pvt_thread_key_t key, void **data));
+
 #ifdef LDAP_DEBUG
 LDAP_F( int )
 ldap_pvt_thread_rdwr_readers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
@@ -220,6 +228,7 @@ typedef enum {
 	LDAP_PVT_THREAD_POOL_PARAM_OPEN,
 	LDAP_PVT_THREAD_POOL_PARAM_STARTING,
 	LDAP_PVT_THREAD_POOL_PARAM_ACTIVE,
+	LDAP_PVT_THREAD_POOL_PARAM_PAUSING,
 	LDAP_PVT_THREAD_POOL_PARAM_PENDING,
 	LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD,
 	LDAP_PVT_THREAD_POOL_PARAM_ACTIVE_MAX,
@@ -259,11 +268,16 @@ ldap_pvt_thread_pool_getkey LDAP_P((
 	ldap_pvt_thread_pool_keyfree_t **kfree ));
 
 LDAP_F( int )
-ldap_pvt_thread_pool_setkey LDAP_P((
+ldap_pvt_thread_pool_setkey_x LDAP_P((
 	void *ctx,
 	void *key,
 	void *data,
-	ldap_pvt_thread_pool_keyfree_t *kfree ));
+	ldap_pvt_thread_pool_keyfree_t *kfree,
+	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 ));