More for ITS#5245

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 50a89c6a23f058956115254773bc62a35f74fa26..3236b89755b42b68d99666a1410bdd026ee982b7 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-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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));
@@ -212,6 +220,7 @@ ldap_pvt_thread_pool_maxthreads LDAP_P((
        ldap_pvt_thread_pool_t *pool,
        int max_threads ));
 
+#ifndef LDAP_PVT_THREAD_H_DONE
 typedef enum {
        LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN = -1,
        LDAP_PVT_THREAD_POOL_PARAM_MAX,
@@ -219,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,
@@ -226,6 +236,7 @@ typedef enum {
        LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD_MAX,
        LDAP_PVT_THREAD_POOL_PARAM_STATE
 } ldap_pvt_thread_pool_param_t;
+#endif /* !LDAP_PVT_THREAD_H_DONE */
 
 LDAP_F( int )
 ldap_pvt_thread_pool_query LDAP_P((
@@ -261,7 +272,9 @@ ldap_pvt_thread_pool_setkey 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 ));
 
 LDAP_F( void )
 ldap_pvt_thread_pool_purgekey LDAP_P(( void *key ));