--- include/ldap_pvt_thread.h 1999/05/27 04:22:04 1.12 +++ include/ldap_pvt_thread.h 2000/07/04 17:58:48 1.12.8.3 @@ -1,5 +1,6 @@ +/* $OpenLDAP: pkg/ldap/include/ldap_pvt_thread.h,v 1.12.8.2 2000/06/13 17:57:15 kurt Exp $ */ /* - * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -13,149 +14,13 @@ #define _LDAP_PVT_THREAD_H #include "ldap_cdefs.h" - -#if defined( HAVE_PTHREADS ) -/********************************** - * * - * definitions for POSIX Threads * - * * - **********************************/ - -#include -#ifdef HAVE_SCHED_H -#include -#endif - -LDAP_BEGIN_DECL - -typedef pthread_t ldap_pvt_thread_t; -typedef pthread_mutex_t ldap_pvt_thread_mutex_t; -typedef pthread_cond_t ldap_pvt_thread_cond_t; - -#if defined( _POSIX_REENTRANT_FUNCTIONS ) || \ - defined( _POSIX_THREAD_SAFE_FUNCTIONS ) || \ - defined( _POSIX_THREADSAFE_FUNCTIONS ) -#define HAVE_REENTRANT_FUNCTIONS 1 -#endif - -#if defined( HAVE_PTHREAD_GETCONCURRENCY ) || \ - defined( HAVE_THR_GETCONCURRENCY ) -#define HAVE_GETCONCURRENCY 1 -#endif - -#if defined( HAVE_PTHREAD_SETCONCURRENCY ) || \ - defined( HAVE_THR_SETCONCURRENCY ) -#define HAVE_SETCONCURRENCY 1 -#endif - -LDAP_END_DECL - -#elif defined ( HAVE_MACH_CTHREADS ) -/********************************** - * * - * definitions for Mach CThreads * - * * - **********************************/ - -#include - -LDAP_BEGIN_DECL - -typedef cthread_t ldap_pvt_thread_t; -typedef struct mutex ldap_pvt_thread_mutex_t; -typedef struct condition ldap_pvt_thread_cond_t; - -LDAP_END_DECL - -#elif defined( HAVE_THR ) -/******************************************** - * * - * thread definitions for Solaris LWP (THR) * - * * - ********************************************/ - -#include -#include - -LDAP_BEGIN_DECL - -typedef thread_t ldap_pvt_thread_t; -typedef mutex_t ldap_pvt_thread_mutex_t; -typedef cond_t ldap_pvt_thread_cond_t; - -#define HAVE_REENTRANT_FUNCTIONS 1 - -#ifdef HAVE_THR_GETCONCURRENCY -#define HAVE_GETCONCURRENCY 1 -#endif -#ifdef HAVE_THR_SETCONCURRENCY -#define HAVE_SETCONCURRENCY 1 -#endif - -LDAP_END_DECL - -#elif defined( HAVE_LWP ) -/************************************* - * * - * thread definitions for SunOS LWP * - * * - *************************************/ - -#include -#include - -LDAP_BEGIN_DECL - -typedef thread_t ldap_pvt_thread_t; -typedef mon_t ldap_pvt_thread_mutex_t; -struct ldap_pvt_thread_lwp_cv { - int lcv_created; - cv_t lcv_cv; -}; -typedef struct ldap_pvt_thread_lwp_cv ldap_pvt_thread_cond_t; - -#define HAVE_REENTRANT_FUNCTIONS 1 - -LDAP_END_DECL - -#elif HAVE_NT_THREADS +#include "ldap_int_thread.h" LDAP_BEGIN_DECL -#define WIN32_LEAN_AND_MEAN -#include -#include - -typedef unsigned long ldap_pvt_thread_t; -typedef HANDLE ldap_pvt_thread_mutex_t; -typedef HANDLE ldap_pvt_thread_cond_t; - -LDAP_END_DECL - -#else - -/*********************************** - * * - * thread definitions for no * - * underlying library support * - * * - ***********************************/ - -LDAP_BEGIN_DECL - -#ifndef NO_THREADS -#define NO_THREADS 1 -#endif - -typedef int ldap_pvt_thread_t; -typedef int ldap_pvt_thread_mutex_t; -typedef int ldap_pvt_thread_cond_t; - -LDAP_END_DECL - -#endif /* no threads support */ - -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; LDAP_F( int ) ldap_pvt_thread_initialize LDAP_P(( void )); @@ -166,19 +31,11 @@ ldap_pvt_thread_destroy LDAP_P(( void )) LDAP_F( unsigned int ) ldap_pvt_thread_sleep LDAP_P(( unsigned int s )); -#ifdef HAVE_GETCONCURRENCY LDAP_F( int ) ldap_pvt_thread_get_concurrency LDAP_P(( void )); -#endif -#ifdef HAVE_SETCONCURRENCY -# ifndef LDAP_THREAD_CONCURRENCY - /* three concurrent threads should be enough */ -# define LDAP_THREAD_CONCURRENCY 3 -# endif LDAP_F( int ) ldap_pvt_thread_set_concurrency LDAP_P(( int )); -#endif #define LDAP_PVT_THREAD_CREATE_JOINABLE 0 #define LDAP_PVT_THREAD_CREATE_DETACHED 1 @@ -234,17 +91,9 @@ ldap_pvt_thread_mutex_trylock LDAP_P(( l LDAP_F( int ) ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex )); -typedef struct ldap_pvt_thread_rdwr_var { - ldap_pvt_thread_mutex_t ltrw_mutex; - ldap_pvt_thread_cond_t ltrw_read; /* wait for read */ - ldap_pvt_thread_cond_t ltrw_write; /* wait for write */ - int ltrw_valid; -#define LDAP_PVT_THREAD_RDWR_VALID 0x0bad - int ltrw_r_active; - int ltrw_w_active; - int ltrw_r_wait; - int ltrw_w_wait; -} ldap_pvt_thread_rdwr_t; +#ifndef LDAP_THREAD_HAVE_RDWR +typedef struct ldap_int_thread_rdwr_s * ldap_pvt_thread_rdwr_t; +#endif LDAP_F( int ) ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp)); @@ -284,6 +133,30 @@ ldap_pvt_thread_rdwr_active LDAP_P((ldap #define LDAP_PVT_THREAD_EINVAL EINVAL #define LDAP_PVT_THREAD_EBUSY EINVAL +typedef ldap_int_thread_pool_t ldap_pvt_thread_pool_t; + +LDAP_F( int ) +ldap_pvt_thread_pool_init LDAP_P(( + ldap_pvt_thread_pool_t *pool_out, + int max_concurrency, + int max_pending )); + +LDAP_F( int ) +ldap_pvt_thread_pool_submit LDAP_P(( + ldap_pvt_thread_pool_t *pool, + void *(*start_routine)( void * ), + void *arg )); + +LDAP_F( int ) +ldap_pvt_thread_pool_backload 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_END_DECL #endif /* _LDAP_THREAD_H */