Import Mark's thread pool max threads changes from devel

diff --git a/configure b/configure
index ccf244cf2077d7ce8b741f552fe462bd3c912033..864c003d80c8d54e952eed854d921376d2e069e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.223.2.5 2000/06/13 17:56:59 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.223.2.6 2000/07/04 17:58:43 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 5b65406731bc163586ff72dbcf2ad03a3758e5b3..da0a3fcdf07698b39ec2552b7f68c1a2f8c03a22 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -138,7 +138,7 @@ 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_threads,
        int max_pending ));
 
 LDAP_F( int )
@@ -147,6 +147,11 @@ ldap_pvt_thread_pool_submit LDAP_P((
        void *(*start_routine)( void * ),
        void *arg ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_maxthreads LDAP_P((
+       ldap_pvt_thread_pool_t *pool,
+       int max_threads ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_backload LDAP_P((
        ldap_pvt_thread_pool_t *pool ));

diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c
index ba44fb22cc7284241844ebaae83eaf6ce8af6f51..c99450c3207c9672dfa0189b358489e051a08cce 100644 (file)
--- a/libraries/libldap_r/tpool.c
+++ b/libraries/libldap_r/tpool.c
@@ -85,7 +85,7 @@ ldap_int_thread_pool_shutdown ( void )
 int
 ldap_pvt_thread_pool_init (
        ldap_pvt_thread_pool_t *tpool,
-       int max_concurrency,
+       int max_threads,
        int max_pending )
 {
        ldap_pvt_thread_pool_t pool;
@@ -104,7 +104,7 @@ ldap_pvt_thread_pool_init (
        if (rc != 0)
                return(rc);
        pool->ltp_state = LDAP_INT_THREAD_POOL_RUNNING;
-       pool->ltp_max_count = max_concurrency;
+       pool->ltp_max_count = max_threads;
        pool->ltp_max_pending = max_pending;
        ldap_pvt_thread_mutex_lock(&ldap_pvt_thread_pool_mutex);
        ldap_int_thread_enlist(&ldap_int_thread_pool_list, pool);
@@ -235,6 +235,25 @@ ldap_pvt_thread_pool_submit (
        return(0);
 }
 
+int
+ldap_pvt_thread_pool_maxthreads ( ldap_pvt_thread_pool_t *tpool, int max_threads )
+{
+       struct ldap_int_thread_pool_s *pool;
+
+       if (tpool == NULL)
+               return(-1);
+
+       pool = *tpool;
+
+       if (pool == NULL)
+               return(-1);
+
+       ldap_pvt_thread_mutex_lock(&pool->ltp_mutex);
+       pool->ltp_max_count = max_threads;
+       ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex);
+       return(0);
+}
+
 int
 ldap_pvt_thread_pool_backload ( ldap_pvt_thread_pool_t *tpool )
 {
@@ -325,6 +344,17 @@ ldap_int_thread_pool_wrapper (
                if (ctx == NULL) {
                        if (pool->ltp_state == LDAP_INT_THREAD_POOL_FINISHING)
                                break;
+                       if (pool->ltp_max_count > 0
+                               && pool->ltp_open_count > pool->ltp_max_count)
+                       {
+                               /* too many threads running (can happen if the
+                                * maximum threads value is set during ongoing
+                                * operation using ldap_pvt_thread_pool_maxthreads)
+                                * so let this thread die.
+                                */
+                               break;
+                       }
+
                        /* we could check an idle timer here, and let the
                         * thread die if it has been inactive for a while.
                         * only die if there are other open threads (i.e.,

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index f5041fe0070dc9dca5c9761f122ab85e1cbb9a21..e031402ec8469d8b22abdc85a7dcd090180130f0 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -161,6 +161,27 @@ read_config( const char *fname )
 
                        ldap_pvt_thread_set_concurrency( c );
 
+               /* set maximum threads in thread pool */
+               } else if ( strcasecmp( cargv[0], "threads" ) == 0 ) {
+                       int c;
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+           "%s: line %d: missing count in \"threads <count>\" line\n",
+                                   fname, lineno, 0 );
+                               return( 1 );
+                       }
+
+                       c = atoi( cargv[1] );
+
+                       if( c < 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+           "%s: line %d: invalid level (%d) in \"threads <count>\" line\n",
+                                   fname, lineno, c );
+                               return( 1 );
+                       }
+
+                       ldap_pvt_thread_pool_maxthreads( &connection_pool, c );
+
                /* get pid file name */
                } else if ( strcasecmp( cargv[0], "pidfile" ) == 0 ) {
                        if ( cargc < 2 ) {

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index cda4397d1aab8ed5fa7df822b73c0d5e2d41e8d0..2e25add973103433bed16616821137b00541a14e 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -94,7 +94,7 @@ slap_init( int mode, const char *name )
        
                        (void) ldap_pvt_thread_initialize();
 
-                       ldap_pvt_thread_pool_init(&connection_pool, 0, 0);
+                       ldap_pvt_thread_pool_init(&connection_pool, SLAP_MAX_WORKER_THREADS, 0);
 
                        ldap_pvt_thread_mutex_init( &currenttime_mutex );
                        ldap_pvt_thread_mutex_init( &entry2str_mutex );

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index e2ddbacca319c2fe8f25243f4708856bd43a6dbf..c55f23196610357bf009cba458bea677b1507409 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -62,6 +62,8 @@ LDAP_BEGIN_DECL
 
 #define MAXREMATCHES 10
 
+#define SLAP_MAX_WORKER_THREADS                32
+
 
 /* psuedo error code indicating abandoned operation */
 #define SLAPD_ABANDON (-1)