alternate fix to ITS#3916

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index c20bb4bbd64ce8eb4bf65517d362568f2196352c..b8e676056aa6417be70f770610271556354ca815 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,8 @@
 #include "slapi/slapi.h"
 #endif
 
+#include "ldap_rq.h"
+
 /*
  * read-only global variables or variables only written by the listener
  * thread (after they are initialized) - no need to protect them with a mutex.
@@ -68,9 +70,6 @@ int                   connection_pool_max = SLAP_MAX_WORKER_THREADS;
 #ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t        gmtime_mutex;
 #endif
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-ldap_pvt_thread_mutex_t        passwd_mutex;
-#endif
 
 slap_counters_t                        slap_counters;
 
@@ -104,60 +103,46 @@ slap_init( int mode, const char *name )
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+               ldap_pvt_thread_pool_init( &connection_pool,
+                               connection_pool_max, 0);
+
+               /* FALLTHRU */
        case SLAP_TOOL_MODE:
                Debug( LDAP_DEBUG_TRACE,
                        "%s init: initiated %s.\n",     name,
                        (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
                        0 );
 
-
                slap_name = name;
 
-               ldap_pvt_thread_pool_init( &connection_pool,
-                               connection_pool_max, 0);
-
                ldap_pvt_thread_mutex_init( &entry2str_mutex );
                ldap_pvt_thread_mutex_init( &replog_mutex );
 
                ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
                ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
-#ifdef HAVE_GMP
-               mpz_init( slap_counters.sc_bytes );
-               mpz_init( slap_counters.sc_pdu );
-               mpz_init( slap_counters.sc_entries );
-               mpz_init( slap_counters.sc_refs );
+               ldap_pvt_mp_init( slap_counters.sc_bytes );
+               ldap_pvt_mp_init( slap_counters.sc_pdu );
+               ldap_pvt_mp_init( slap_counters.sc_entries );
+               ldap_pvt_mp_init( slap_counters.sc_refs );
 
-               mpz_init( slap_counters.sc_ops_completed );
-               mpz_init( slap_counters.sc_ops_initiated );
+               ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
+               ldap_pvt_mp_init( slap_counters.sc_ops_completed );
+
+               ldap_pvt_thread_mutex_init( &slapd_rq.rq_mutex );
+               LDAP_STAILQ_INIT( &slapd_rq.task_list );
+               LDAP_STAILQ_INIT( &slapd_rq.run_list );
 
 #ifdef SLAPD_MONITOR
                for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       mpz_init( slap_counters.sc_ops_initiated_[ i ] );
-                       mpz_init( slap_counters.sc_ops_completed_[ i ] );
-               }
-#endif /* SLAPD_MONITOR */
-#else /* ! HAVE_GMP */
-               slap_counters.sc_bytes = 0;
-               slap_counters.sc_pdu = 0;
-               slap_counters.sc_entries = 0;
-               slap_counters.sc_refs = 0;
-
-               slap_counters.sc_ops_completed = 0;
-               slap_counters.sc_ops_initiated = 0;
-#ifdef SLAPD_MONITOR
-               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       slap_counters.sc_ops_initiated_[ i ] = 0;
-                       slap_counters.sc_ops_completed_[ i ] = 0;
+                       ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
                }
 #endif /* SLAPD_MONITOR */
-#endif /* ! HAVE_GMP */
 
 #ifndef HAVE_GMTIME_R
                ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #endif
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-               ldap_pvt_thread_mutex_init( &passwd_mutex );
-#endif
+               slap_passwd_init();
 
                rc = slap_sasl_init();
 
@@ -193,7 +178,7 @@ int slap_startup( Backend *be )
        if( rc == 0 ) {
                Slapi_PBlock *pb = slapi_pblock_new();
 
-               if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+               if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
                        rc = -1;
                }
                slapi_pblock_destroy( pb );
@@ -219,7 +204,7 @@ int slap_shutdown( Backend *be )
 
 #ifdef LDAP_SLAPI
        pb = slapi_pblock_new();
-       (void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+       (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
        slapi_pblock_destroy( pb );
 #endif /* LDAP_SLAPI */
 
@@ -251,21 +236,19 @@ int slap_destroy(void)
 
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
-#ifdef HAVE_GMP
-               mpz_clear( slap_counters.sc_bytes );
-               mpz_clear( slap_counters.sc_pdu );
-               mpz_clear( slap_counters.sc_entries );
-               mpz_clear( slap_counters.sc_refs );
-               mpz_clear( slap_counters.sc_ops_completed );
-               mpz_clear( slap_counters.sc_ops_initiated );
+               ldap_pvt_mp_clear( slap_counters.sc_bytes );
+               ldap_pvt_mp_clear( slap_counters.sc_pdu );
+               ldap_pvt_mp_clear( slap_counters.sc_entries );
+               ldap_pvt_mp_clear( slap_counters.sc_refs );
+               ldap_pvt_mp_clear( slap_counters.sc_ops_initiated );
+               ldap_pvt_mp_clear( slap_counters.sc_ops_completed );
 
 #ifdef SLAPD_MONITOR
                for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       mpz_clear( slap_counters.sc_ops_initiated_[ i ] );
-                       mpz_clear( slap_counters.sc_ops_completed_[ i ] );
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_completed_[ i ] );
                }
 #endif /* SLAPD_MONITOR */
-#endif /* HAVE_GMP */
                break;
 
        default: