Fix for ITS#5225

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 75d4777e3fab84692afe68a245d55c040b306457..4a612a0d4a4974e6668cc6f65dea5f8a4820539c 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -1,27 +1,41 @@
+/* ldap_pvt_thread.h - ldap threads header file */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ * 
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* ldap_pvt_thread.h - ldap threads header file NG */
 
 #ifndef _LDAP_PVT_THREAD_H
-#define _LDAP_PVT_THREAD_H
+#define _LDAP_PVT_THREAD_H /* libldap_r/ldap_thr_debug.h #undefines this */
 
 #include "ldap_cdefs.h"
 #include "ldap_int_thread.h"
 
 LDAP_BEGIN_DECL
 
-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;
+#ifndef LDAP_PVT_THREAD_H_DONE
+typedef ldap_int_thread_t                      ldap_pvt_thread_t;
+#ifdef LDAP_THREAD_DEBUG_WRAP
+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;
+#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;
+#endif
+#endif /* !LDAP_PVT_THREAD_H_DONE */
+
+#define ldap_pvt_thread_equal          ldap_int_thread_equal
 
 LDAP_F( int )
 ldap_pvt_thread_initialize LDAP_P(( void ));
@@ -41,19 +55,25 @@ ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 #define LDAP_PVT_THREAD_CREATE_JOINABLE 0
 #define LDAP_PVT_THREAD_CREATE_DETACHED 1
 
+#ifndef LDAP_PVT_THREAD_H_DONE
+#define        LDAP_PVT_THREAD_SET_STACK_SIZE
 #ifndef LDAP_PVT_THREAD_STACK_SIZE
-       /* LARGE stack */
-#define LDAP_PVT_THREAD_STACK_SIZE     (64*1024*1024)
+       /* 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
 #endif
+#endif /* !LDAP_PVT_THREAD_H_DONE */
 
-LDAP_F( int ) 
+LDAP_F( int )
 ldap_pvt_thread_create LDAP_P((
-       ldap_pvt_thread_t * thread, 
+       ldap_pvt_thread_t * thread,
        int     detach,
-       void *(*start_routine)( void * ), 
+       void *(*start_routine)( void * ),
        void *arg));
 
-LDAP_F( void ) 
+LDAP_F( void )
 ldap_pvt_thread_exit LDAP_P(( void *retval ));
 
 LDAP_F( int )
@@ -79,7 +99,7 @@ ldap_pvt_thread_cond_broadcast LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
 LDAP_F( int )
 ldap_pvt_thread_cond_wait LDAP_P((
-       ldap_pvt_thread_cond_t *cond, 
+       ldap_pvt_thread_cond_t *cond,
        ldap_pvt_thread_mutex_t *mutex ));
 
 LDAP_F( int )
@@ -97,9 +117,8 @@ ldap_pvt_thread_mutex_trylock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 LDAP_F( int )
 ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-#ifndef LDAP_THREAD_HAVE_RDWR
-typedef struct ldap_int_thread_rdwr_s * ldap_pvt_thread_rdwr_t;
-#endif
+LDAP_F( ldap_pvt_thread_t )
+ldap_pvt_thread_self LDAP_P(( void ));
 
 LDAP_F( int )
 ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
@@ -139,8 +158,13 @@ ldap_pvt_thread_rdwr_active LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 #define LDAP_PVT_THREAD_EINVAL EINVAL
 #define LDAP_PVT_THREAD_EBUSY EINVAL
 
+#ifndef LDAP_PVT_THREAD_H_DONE
 typedef ldap_int_thread_pool_t ldap_pvt_thread_pool_t;
 
+typedef void * (ldap_pvt_thread_start_t) LDAP_P((void *ctx, void *arg));
+typedef void (ldap_pvt_thread_pool_keyfree_t) LDAP_P((void *key, void *data));
+#endif /* !LDAP_PVT_THREAD_H_DONE */
+
 LDAP_F( int )
 ldap_pvt_thread_pool_init LDAP_P((
        ldap_pvt_thread_pool_t *pool_out,
@@ -150,7 +174,7 @@ ldap_pvt_thread_pool_init LDAP_P((
 LDAP_F( int )
 ldap_pvt_thread_pool_submit LDAP_P((
        ldap_pvt_thread_pool_t *pool,
-       void *(*start_routine)( void * ),
+       ldap_pvt_thread_start_t *start,
        void *arg ));
 
 LDAP_F( int )
@@ -162,12 +186,43 @@ LDAP_F( int )
 ldap_pvt_thread_pool_backload LDAP_P((
        ldap_pvt_thread_pool_t *pool ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_pause LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
+LDAP_F( int )
+ldap_pvt_thread_pool_resume LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_destroy LDAP_P((
        ldap_pvt_thread_pool_t *pool,
        int run_pending ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_getkey LDAP_P((
+       void *ctx,
+       void *key,
+       void **data,
+       ldap_pvt_thread_pool_keyfree_t **kfree ));
+
+LDAP_F( int )
+ldap_pvt_thread_pool_setkey LDAP_P((
+       void *ctx,
+       void *key,
+       void *data,
+       ldap_pvt_thread_pool_keyfree_t *kfree ));
+
+LDAP_F( void )
+ldap_pvt_thread_pool_purgekey LDAP_P(( void *key ));
+
+LDAP_F( void *)
+ldap_pvt_thread_pool_context LDAP_P(( void ));
+
+LDAP_F( void )
+ldap_pvt_thread_pool_context_reset LDAP_P(( void *key ));
 
 LDAP_END_DECL
 
+#define LDAP_PVT_THREAD_H_DONE
 #endif /* _LDAP_THREAD_H */