X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b7a3fc3bac0a9d8e2094767c8c043049dba22550;hb=20965abe9c5bb80d79e5ad791cd2b59ec60259b5;hp=36face1b28644ed01b155ca09e500cac3f8eb8f9;hpb=354d49fb9a2e7112b422844a4e1059f55634705d;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 36face1b28..b7a3fc3bac 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -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"
 
@@ -9,6 +33,10 @@
 #include <ac/time.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
@@ -22,33 +50,30 @@ int		ldap_syslog = LDAP_DEBUG_STATS;
 int		ldap_syslog;
 #endif
 
+#ifdef LOG_DEBUG
 int		ldap_syslog_level = LOG_DEBUG;
-struct berval **default_referral = NULL;
-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;
-
+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;
-#ifdef SLAPD_CRYPT
-ldap_pvt_thread_mutex_t	crypt_mutex;
+#endif
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+ldap_pvt_thread_mutex_t	passwd_mutex;
 #endif
 
-int				num_conns;
-long			num_ops_initiated;
-long			num_ops_completed;
-ldap_pvt_thread_mutex_t	num_ops_mutex;
+slap_counters_t			slap_counters;
 
-long			num_entries_sent;
-long			num_refs_sent;
-long			num_bytes_sent;
-long			num_pdu_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.
@@ -56,70 +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;
 
-static ldap_pvt_thread_mutex_t	currenttime_mutex;
-
 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;
+
+		ldap_pvt_thread_pool_init( &connection_pool,
+				connection_pool_max, 0);
 
-			slap_name = name;
-	
-			(void) ldap_pvt_thread_initialize();
+		ldap_pvt_thread_mutex_init( &entry2str_mutex );
+		ldap_pvt_thread_mutex_init( &replog_mutex );
 
-			ldap_pvt_thread_mutex_init( &active_threads_mutex );
-			ldap_pvt_thread_cond_init( &active_threads_cond );
+		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_thread_mutex_init( &currenttime_mutex );
-			ldap_pvt_thread_mutex_init( &entry2str_mutex );
-			ldap_pvt_thread_mutex_init( &replog_mutex );
-			ldap_pvt_thread_mutex_init( &num_ops_mutex );
-			ldap_pvt_thread_mutex_init( &num_sent_mutex );
+		ldap_pvt_mp_init( slap_counters.sc_ops_completed );
+		ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
 
-			ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#ifdef SLAPD_CRYPT
-			ldap_pvt_thread_mutex_init( &crypt_mutex );
+#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();
 
-		default:
-			Debug( LDAP_DEBUG_ANY,
-	   	 		"%s init: undefined mode (%d).\n", name, mode, 0 );
-			rc = 1;
-			break;
+		if( rc == 0 ) {
+			rc = backend_init( );
+		}
+
+		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;
 
@@ -127,27 +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 ) {
-		rc = sasl_init();
+		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 );
 
-	sasl_destroy();
-
 	/* 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;
 }
@@ -155,25 +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;
 }
-
-/* should create a utils.c for these */
-time_t slap_get_time(void)
-{
-	time_t t;
-	ldap_pvt_thread_mutex_lock( &currenttime_mutex );
-	time( &t );
-	ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
-	return t;
-}