]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/init.c
Revert ITS#3353 patch, it needs to be reworked.
[openldap] / servers / slapd / init.c
index dca72737b5b6b507eb64a1fa02ae9f7fa9b490a4..b7a3fc3bac0a9d8e2094767c8c043049dba22550 100644 (file)
@@ -1,4 +1,28 @@
 /* init.c - initialize various things */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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 in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
 
 #include "portable.h"
 
@@ -8,8 +32,11 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "portable.h"
 #include "slap.h"
+#include "lber_pvt.h"
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
 
 /*
  * read-only global variables or variables only written by the listener
@@ -23,37 +50,30 @@ int         ldap_syslog = LDAP_DEBUG_STATS;
 int            ldap_syslog;
 #endif
 
+#ifdef LOG_DEBUG
 int            ldap_syslog_level = LOG_DEBUG;
-char           *default_referral;
-time_t         starttime;
-ldap_pvt_thread_t      listener_tid;
-int            g_argc;
-char           **g_argv;
+#endif
+
+BerVarray default_referral = NULL;
+
+struct berval AllUser = BER_BVC( LDAP_ALL_USER_ATTRIBUTES );
+struct berval AllOper = BER_BVC( LDAP_ALL_OPERATIONAL_ATTRIBUTES );
+struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
 
 /*
  * global variables that need mutex protection
  */
-int                            active_threads;
-ldap_pvt_thread_mutex_t        active_threads_mutex;
-ldap_pvt_thread_cond_t active_threads_cond;
-
-time_t                 currenttime;
-ldap_pvt_thread_mutex_t        currenttime_mutex;
-
-ldap_pvt_thread_mutex_t        new_conn_mutex;
-
-#ifdef SLAPD_CRYPT
-ldap_pvt_thread_mutex_t        crypt_mutex;
+ldap_pvt_thread_pool_t connection_pool;
+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
 
-int                            num_conns;
-long                   ops_initiated;
-long                   ops_completed;
-ldap_pvt_thread_mutex_t        ops_mutex;
+slap_counters_t                        slap_counters;
 
-long                   num_entries_sent;
-long                   num_bytes_sent;
-ldap_pvt_thread_mutex_t        num_sent_mutex;
 /*
  * these mutexes must be used when calling the entry2str()
  * routine since it returns a pointer to static data.
@@ -61,67 +81,88 @@ ldap_pvt_thread_mutex_t     num_sent_mutex;
 ldap_pvt_thread_mutex_t        entry2str_mutex;
 ldap_pvt_thread_mutex_t        replog_mutex;
 
-static char* slap_name;
+static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
 int
-slap_init( int mode, char *name )
+slap_init( int mode, const char *name )
 {
        int rc;
+       int i;
+
+       assert( mode );
 
-       if( slapMode != SLAP_UNDEFINED_MODE ) {
+       if ( slapMode != SLAP_UNDEFINED_MODE ) {
                Debug( LDAP_DEBUG_ANY,
-                "%s init: init called twice (old=%d, new=%d)\n",
-                name, slapMode, mode );
+                "%s init: init called twice (old=%d, new=%d)\n",
+                name, slapMode, mode );
+
                return 1;
        }
 
        slapMode = mode;
 
-       switch ( slapMode ) {
+       switch ( slapMode & SLAP_MODE ) {
+       case SLAP_SERVER_MODE:
+       case SLAP_TOOL_MODE:
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s init: initiated %s.\n",     name,
+                       (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
+                       0 );
 
-               case SLAP_SERVER_MODE:
-               case SLAP_TOOL_MODE:
-#ifdef SLAPD_BDB2
-               case SLAP_TIMEDSERVER_MODE:
-               case SLAP_TOOLID_MODE:
-#endif
 
-                       Debug( LDAP_DEBUG_TRACE,
-                               "%s init: initiated %s.\n",
-                               name, mode == SLAP_TOOL_MODE ? "tool" : "server", 0 );
-
-                       slap_name = name;
-       
-                       (void) ldap_pvt_thread_initialize();
-
-                       ldap_pvt_thread_mutex_init( &active_threads_mutex );
-                       ldap_pvt_thread_cond_init( &active_threads_cond );
-
-                       ldap_pvt_thread_mutex_init( &new_conn_mutex );
-                       ldap_pvt_thread_mutex_init( &currenttime_mutex );
-                       ldap_pvt_thread_mutex_init( &entry2str_mutex );
-                       ldap_pvt_thread_mutex_init( &replog_mutex );
-                       ldap_pvt_thread_mutex_init( &ops_mutex );
-                       ldap_pvt_thread_mutex_init( &num_sent_mutex );
-#ifdef SLAPD_CRYPT
-                       ldap_pvt_thread_mutex_init( &crypt_mutex );
+               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 );
+               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 );
+
+               ldap_pvt_mp_init( slap_counters.sc_ops_completed );
+               ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
+
+#ifdef SLAPD_MONITOR
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
+               }
+#endif /* SLAPD_MONITOR */
+
+#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
 
-                       rc = backend_init();
-                       break;
+               rc = slap_sasl_init();
+
+               if( rc == 0 ) {
+                       rc = backend_init( );
+               }
+
+               break;
 
-               default:
-                       Debug( LDAP_DEBUG_ANY,
-                               "%s init: undefined mode (%d).\n", name, mode, 0 );
-                       rc = 1;
-                       break;
+       default:
+               Debug( LDAP_DEBUG_ANY,
+                       "%s init: undefined mode (%d).\n", name, mode, 0 );
+
+               rc = 1;
+               break;
        }
 
        return rc;
 }
 
-int slap_startup(int dbnum)
+int slap_startup( Backend *be )
 {
        int rc;
 
@@ -129,21 +170,42 @@ int slap_startup(int dbnum)
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
 
-       rc = backend_startup(dbnum);
+
+       rc = backend_startup( be );
+
+#ifdef LDAP_SLAPI
+       if( rc == 0 ) {
+               Slapi_PBlock *pb = slapi_pblock_new();
+
+               if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+                       rc = -1;
+               }
+               slapi_pblock_destroy( pb );
+       }
+#endif /* LDAP_SLAPI */
 
        return rc;
 }
 
-int slap_shutdown(int dbnum)
+int slap_shutdown( Backend *be )
 {
        int rc;
+#ifdef LDAP_SLAPI
+       Slapi_PBlock *pb;
+#endif
 
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
 
        /* let backends do whatever cleanup they need to do */
-       rc = backend_shutdown(dbnum); 
+       rc = backend_shutdown( be ); 
+
+#ifdef LDAP_SLAPI
+       pb = slapi_pblock_new();
+       (void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+       slapi_pblock_destroy( pb );
+#endif /* LDAP_SLAPI */
 
        return rc;
 }
@@ -151,14 +213,54 @@ int slap_shutdown(int dbnum)
 int slap_destroy(void)
 {
        int rc;
+       int i;
 
        Debug( LDAP_DEBUG_TRACE,
-               "%s shutdown: freeing system resources.\n",
+               "%s destroy: freeing system resources.\n",
                slap_name, 0, 0 );
 
+       if ( default_referral ) {
+               ber_bvarray_free( default_referral );
+       }
+
        rc = backend_destroy();
 
+       slap_sasl_destroy();
+
+       entry_destroy();
+
+       switch ( slapMode & SLAP_MODE ) {
+       case SLAP_SERVER_MODE:
+       case SLAP_TOOL_MODE:
+
+               ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
+               ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
+               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_completed );
+               ldap_pvt_mp_clear( slap_counters.sc_ops_initiated );
+
+#ifdef SLAPD_MONITOR
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_completed_[ i ] );
+               }
+#endif /* SLAPD_MONITOR */
+               break;
+
+       default:
+               Debug( LDAP_DEBUG_ANY,
+                       "slap_destroy(): undefined mode (%d).\n", slapMode, 0, 0 );
+
+               rc = 1;
+               break;
+
+       }
+
+       ldap_pvt_thread_destroy();
+
        /* should destory the above mutex */
        return rc;
 }
-