X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_pvt_thread.h;h=de9a07ce059bc7f62ca72d8902d1f78222eee53c;hb=a8437c203858e579c4d6c96d4feedb4647d8aca2;hp=a1ccea6f04faa14a5daa01c96ef36eabc7141386;hpb=c32dcd63659d3fb68b6d0e64f9a9a5331787def7;p=openldap

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index a1ccea6f04..de9a07ce05 100644
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -1,11 +1,13 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms 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.
+ * 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.
  */
 /* ldap_pvt_thread.h - ldap threads header file NG */
 
@@ -13,260 +15,158 @@
 #define _LDAP_PVT_THREAD_H
 
 #include "ldap_cdefs.h"
-
-#if defined( HAVE_PTHREADS )
-/**********************************
- *                                *
- * definitions for POSIX Threads  *
- *                                *
- **********************************/
-
-#include <pthread.h>
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-LDAP_BEGIN_DECL
-
-typedef pthread_t		ldap_pvt_thread_t;
-typedef pthread_attr_t		ldap_pvt_thread_attr_t;
-typedef pthread_mutex_t		ldap_pvt_thread_mutex_t;
-typedef pthread_mutexattr_t	ldap_pvt_thread_mutexattr_t;
-typedef pthread_cond_t		ldap_pvt_thread_cond_t;
-typedef pthread_condattr_t	ldap_pvt_thread_condattr_t;
-
-#define LDAP_PVT_THREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED 
-#define LDAP_PVT_THREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE 
-
-#if defined( _POSIX_REENTRANT_FUNCTIONS ) || \
-	defined( _POSIX_THREAD_SAFE_FUNCTIONS ) || \
-	defined( _POSIX_THREADSAFE_FUNCTIONS )
-#define HAVE_REENTRANT_FUNCTIONS 1
-#endif
-
-LDAP_END_DECL
-
-#elif defined ( HAVE_MACH_CTHREADS )
-/**********************************
- *                                *
- * definitions for Mach CThreads  *
- *                                *
- **********************************/
-
-#include <mach/cthreads.h>
+#include "ldap_int_thread.h"
 
 LDAP_BEGIN_DECL
 
-typedef cthread_t		ldap_pvt_thread_t;
-typedef int			ldap_pvt_thread_attr_t;
-typedef struct mutex		ldap_pvt_thread_mutex_t;
-typedef int			ldap_pvt_thread_mutexattr_t;
-typedef struct condition	ldap_pvt_thread_cond_t;
-typedef int			ldap_pvt_thread_condattr_t;
+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;
 
-#define LDAP_PVT_THREAD_CREATE_DETACHED 1
-#define LDAP_PVT_THREAD_CREATE_JOINABLE 0
-
-LDAP_END_DECL
+LDAP_F( int )
+ldap_pvt_thread_initialize LDAP_P(( void ));
 
-#elif defined( HAVE_THR )
-/**************************************
- *                                    *
- * thread definitions for Solaris LWP *
- *                                    *
- **************************************/
+LDAP_F( int )
+ldap_pvt_thread_destroy LDAP_P(( void ));
 
-#include <thread.h>
-#include <synch.h>
+LDAP_F( unsigned int )
+ldap_pvt_thread_sleep LDAP_P(( unsigned int s ));
 
-LDAP_BEGIN_DECL
+LDAP_F( int )
+ldap_pvt_thread_get_concurrency LDAP_P(( void ));
 
-typedef thread_t		ldap_pvt_thread_t;
-typedef int			ldap_pvt_thread_attr_t;
-typedef mutex_t			ldap_pvt_thread_mutex_t;
-typedef int			ldap_pvt_thread_mutexattr_t;
-typedef cond_t			ldap_pvt_thread_cond_t;
-typedef int			ldap_pvt_thread_condattr_t;
+LDAP_F( int )
+ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 
-#define LDAP_PVT_THREAD_CREATE_DETACHED THR_DETACHED
 #define LDAP_PVT_THREAD_CREATE_JOINABLE 0
-
-#define HAVE_REENTRANT_FUNCTIONS 1
-
-LDAP_END_DECL
-
-#elif defined( HAVE_LWP )
-/*************************************
- *                                   *
- * thread definitions for SunOS LWP  *
- *                                   *
- *************************************/
-
-#include <lwp/lwp.h>
-#include <lwp/stackdep.h>
-
-LDAP_BEGIN_DECL
-
-typedef thread_t		ldap_pvt_thread_t;
-typedef int			ldap_pvt_thread_attr_t;
-typedef mon_t			ldap_pvt_thread_mutex_t;
-typedef int			ldap_pvt_thread_mutexattr_t;
-struct lwpcv {
-	int		lcv_created;
-	cv_t		lcv_cv;
-};
-typedef struct lwpcv		ldap_pvt_thread_cond_t;
-typedef int			ldap_pvt_thread_condattr_t;
-
 #define LDAP_PVT_THREAD_CREATE_DETACHED 1
-#define LDAP_PVT_THREAD_CREATE_JOINABLE 0
 
-#define HAVE_REENTRANT_FUNCTIONS 1
+#ifndef LDAP_PVT_THREAD_STACK_SIZE
+	/* LARGE stack */
+#define LDAP_PVT_THREAD_STACK_SIZE	(16*1024*1024)
+#endif
 
-stkalign_t *ldap_pvt_thread_get_stack( int *stacknop );
-void ldap_pvt_thread_free_stack( int *stackno );
+LDAP_F( int ) 
+ldap_pvt_thread_create LDAP_P((
+	ldap_pvt_thread_t * thread, 
+	int	detach,
+	void *(*start_routine)( void * ), 
+	void *arg));
 
-LDAP_END_DECL
+LDAP_F( void ) 
+ldap_pvt_thread_exit LDAP_P(( void *retval ));
 
-#elif HAVE_NT_THREADS
+LDAP_F( int )
+ldap_pvt_thread_join LDAP_P(( ldap_pvt_thread_t thread, void **status ));
 
-#include <windows.h>
-#include <process.h>
+LDAP_F( int )
+ldap_pvt_thread_kill LDAP_P(( ldap_pvt_thread_t thread, int signo ));
 
-LDAP_BEGIN_DECL
+LDAP_F( int )
+ldap_pvt_thread_yield LDAP_P(( void ));
 
-typedef HANDLE			ldap_pvt_thread_t;
-typedef int			ldap_pvt_thread_attr_t;
-typedef HANDLE			ldap_pvt_thread_mutex_t;
-typedef int			ldap_pvt_thread_mutexattr_t;
-typedef HANDLE			ldap_pvt_thread_cond_t;
-typedef int			ldap_pvt_thread_condattr_t;
+LDAP_F( int )
+ldap_pvt_thread_cond_init LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-#define LDAP_PVT_THREAD_CREATE_DETACHED 0
-#define LDAP_PVT_THREAD_CREATE_JOINABLE 0
+LDAP_F( int )
+ldap_pvt_thread_cond_destroy LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LDAP_END_DECL
+LDAP_F( int )
+ldap_pvt_thread_cond_signal LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-#else
+LDAP_F( int )
+ldap_pvt_thread_cond_broadcast LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-/***********************************
- *                                 *
- * thread definitions for no       *
- * underlying library support      *
- *                                 *
- ***********************************/
+LDAP_F( int )
+ldap_pvt_thread_cond_wait LDAP_P((
+	ldap_pvt_thread_cond_t *cond, 
+	ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_BEGIN_DECL
+LDAP_F( int )
+ldap_pvt_thread_mutex_init LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-#ifndef NO_THREADS
-#define NO_THREADS 1
-#endif
+LDAP_F( int )
+ldap_pvt_thread_mutex_destroy LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-typedef int			ldap_pvt_thread_t;
-typedef int			ldap_pvt_thread_attr_t;
-typedef int			ldap_pvt_thread_mutex_t;
-typedef int			ldap_pvt_thread_mutexattr_t;
-typedef int			ldap_pvt_thread_cond_t;
-typedef int			ldap_pvt_thread_condattr_t;
+LDAP_F( int )
+ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-#define LDAP_PVT_THREAD_CREATE_DETACHED 0
-#define LDAP_PVT_THREAD_CREATE_JOINABLE 0
+LDAP_F( int )
+ldap_pvt_thread_mutex_trylock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_END_DECL
-
-#endif /* no threads support */
+LDAP_F( int )
+ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-#ifndef NO_THREADS
-#	define HAVE_THREADS 1
+#ifndef LDAP_THREAD_HAVE_RDWR
+typedef struct ldap_int_thread_rdwr_s * ldap_pvt_thread_rdwr_t;
 #endif
 
-LDAP_BEGIN_DECL
-
-LDAP_F int 
-ldap_pvt_thread_create LDAP_P(( ldap_pvt_thread_t * thread, 
-			       ldap_pvt_thread_attr_t *attr,
-			       void *(*start_routine)( void *), 
-			       void *arg));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F void 
-ldap_pvt_thread_exit LDAP_P(( void *retval ));
-
-LDAP_F int 
-ldap_pvt_thread_join LDAP_P(( ldap_pvt_thread_t thread, 
-			     void **thread_return ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_destroy LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_kill LDAP_P(( ldap_pvt_thread_t thread, int signo ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_rlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_yield LDAP_P(( void ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_rtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_attr_init LDAP_P(( ldap_pvt_thread_attr_t *attr ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_runlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_attr_destroy LDAP_P(( ldap_pvt_thread_attr_t *attr ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_wlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_attr_setdetachstate LDAP_P(( ldap_pvt_thread_attr_t *attr, 
-					    int dstate ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_wtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_cond_init LDAP_P(( ldap_pvt_thread_cond_t *cond,
-				  ldap_pvt_thread_condattr_t *attr ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_wunlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_cond_signal LDAP_P(( ldap_pvt_thread_cond_t *cond ));
+#ifdef LDAP_DEBUG
+LDAP_F( int )
+ldap_pvt_thread_rdwr_readers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_cond_broadcast LDAP_P(( ldap_pvt_thread_cond_t *cond ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_writers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
-LDAP_F int 
-ldap_pvt_thread_cond_wait LDAP_P(( ldap_pvt_thread_cond_t *cond, 
-				  ldap_pvt_thread_mutex_t *mutex ));
+LDAP_F( int )
+ldap_pvt_thread_rdwr_active LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
+#endif /* LDAP_DEBUG */
 
-LDAP_F int 
-ldap_pvt_thread_mutex_init LDAP_P(( ldap_pvt_thread_mutex_t *mutex,
-				   ldap_pvt_thread_mutexattr_t *attr ));
+#define LDAP_PVT_THREAD_EINVAL EINVAL
+#define LDAP_PVT_THREAD_EBUSY EINVAL
 
-LDAP_F int 
-ldap_pvt_thread_mutex_destroy LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
+typedef ldap_int_thread_pool_t ldap_pvt_thread_pool_t;
 
-LDAP_F int 
-ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
+LDAP_F( int )
+ldap_pvt_thread_pool_init LDAP_P((
+	ldap_pvt_thread_pool_t *pool_out,
+	int max_threads,
+	int max_pending ));
 
-LDAP_F int 
-ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
+LDAP_F( int )
+ldap_pvt_thread_pool_submit LDAP_P((
+	ldap_pvt_thread_pool_t *pool,
+	void *(*start_routine)( void * ),
+	void *arg ));
 
-typedef struct ldap_pvt_thread_rdwr_var {
-	int readers_reading;
-	int writer_writing;
-	ldap_pvt_thread_mutex_t mutex;
-	ldap_pvt_thread_cond_t lock_free;
-} ldap_pvt_thread_rdwr_t;
+LDAP_F( int )
+ldap_pvt_thread_pool_maxthreads LDAP_P((
+	ldap_pvt_thread_pool_t *pool,
+	int max_threads ));
 
-typedef void * ldap_pvt_thread_rdwrattr_t;
+LDAP_F( int )
+ldap_pvt_thread_pool_backload LDAP_P((
+	ldap_pvt_thread_pool_t *pool ));
 
-LDAP_F int 
-ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp, 
-				  ldap_pvt_thread_rdwrattr_t *attrp));
-LDAP_F int 
-ldap_pvt_thread_rdwr_rlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
-ldap_pvt_thread_rdwr_runlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
-ldap_pvt_thread_rdwr_wlock 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_pool_destroy LDAP_P((
+	ldap_pvt_thread_pool_t *pool,
+	int run_pending ));
 
-#ifdef LDAP_DEBUG
-LDAP_F int 
-ldap_pvt_thread_rdwr_rchk LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
-ldap_pvt_thread_rdwr_wchk LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
-ldap_pvt_thread_rdwr_rwchk LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-#endif /* LDAP_DEBUG */
 
 LDAP_END_DECL