X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=6ab72623220e8579b275ff378ea5b78a3545cc0f;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=f90cb6ba589c5970113f21efd9b226a0ee3d75b4;hpb=42f6e78dd4e2d481c1bc75b8bc6d38fe9c62bc07;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index f90cb6ba58..6ab7262322 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-2003 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.h"
+#endif
 
 /*
  * read-only global variables or variables only written by the listener
@@ -23,36 +50,40 @@ 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;
-
-long			num_entries_sent;
-long			num_bytes_sent;
+unsigned long			num_ops_initiated = 0;
+unsigned long			num_ops_completed = 0;
+#ifdef SLAPD_MONITOR
+unsigned long			num_ops_initiated_[SLAP_OP_LAST];
+unsigned long			num_ops_completed_[SLAP_OP_LAST];
+#endif /* SLAPD_MONITOR */
+ldap_pvt_thread_mutex_t	num_ops_mutex;
+
+unsigned long			num_entries_sent;
+unsigned long			num_refs_sent;
+unsigned long			num_bytes_sent;
+unsigned long			num_pdu_sent;
 ldap_pvt_thread_mutex_t	num_sent_mutex;
 /*
  * these mutexes must be used when calling the entry2str()
@@ -61,81 +92,156 @@ 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;
 
+	assert( mode );
+
 	if( slapMode != SLAP_UNDEFINED_MODE ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, 
+			"init: %s init called twice (old=%d, new=%d)\n",
+			name, slapMode, mode );
+#else
 		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 );
+#endif
+
 		return 1;
 	}
 
 	slapMode = mode;
 
-	if( ( slapMode != SLAP_SERVER_MODE ) && ( slapMode != SLAP_TOOL_MODE ) ) {
-		Debug( LDAP_DEBUG_ANY,
-	   	 "%s init: undefined mode (%d).\n",
-	   	 name, mode, 0 );
-		return 1;
-	}
+	switch ( slapMode & SLAP_MODE ) {
+		case SLAP_SERVER_MODE:
+		case SLAP_TOOL_MODE:
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, DETAIL1, 
+				"init: %s initiation, initiated %s.\n",
+				name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? 
+				  "tool" : "server", 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE,
+				"%s init: initiated %s.\n",	name,
+				(mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
+				0 );
+#endif
 
-	Debug( LDAP_DEBUG_TRACE,
-		"%s init: initiated %s.\n",
-		name,
-		mode == SLAP_SERVER_MODE ? "server" : "tool",
-		0 );
 
-	slap_name = name;
+			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 );
+			(void) ldap_pvt_thread_initialize();
+
+			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( &num_ops_mutex );
+			ldap_pvt_thread_mutex_init( &num_sent_mutex );
+
+#ifdef SLAPD_MONITOR
+			{
+				int i;
+				for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+					num_ops_initiated_[ i ] = 0;
+					num_ops_completed_[ i ] = 0;
+				}
+			}
+#endif
+
+#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();
+			rc = slap_sasl_init();
+
+			if( rc == 0 ) {
+				rc = backend_init( );
+			}
+
+			break;
+
+		default:
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, ERR, 
+				"init: %s init, undefined mode (%d).\n", name, mode, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY,
+				"%s init: undefined mode (%d).\n", name, mode, 0 );
+#endif
+
+			rc = 1;
+			break;
+	}
 
 	return rc;
 }
 
-int slap_startup(int dbnum)
+int slap_startup( Backend *be )
 {
 	int rc;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, CRIT, "slap_startup: %s started\n", slap_name, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE,
 		"%s startup: initiated.\n",
 		slap_name, 0, 0 );
+#endif
+
 
-	rc = backend_startup(dbnum);
+	rc = backend_startup( be );
+
+#ifdef LDAP_SLAPI
+	if( rc == 0 ) {
+		Slapi_PBlock *pb = slapi_pblock_new();
+
+		if ( doPluginFNs( 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
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, CRIT, 
+		"slap_shutdown: %s shutdown initiated.\n", slap_name, 0, 0);
+#else
 	Debug( LDAP_DEBUG_TRACE,
 		"%s shutdown: initiated\n",
 		slap_name, 0, 0 );
+#endif
+
+
+	slap_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) doPluginFNs( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+	slapi_pblock_destroy( pb );
+#endif /* LDAP_SLAPI */
 
 	return rc;
 }
@@ -144,13 +250,22 @@ int slap_destroy(void)
 {
 	int rc;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, INFO, 
+		"slap_destroy: %s freeing system resources.\n", slap_name, 0, 0);
+#else
 	Debug( LDAP_DEBUG_TRACE,
 		"%s shutdown: freeing system resources.\n",
 		slap_name, 0, 0 );
+#endif
+
 
 	rc = backend_destroy();
 
+	entry_destroy();
+
+	ldap_pvt_thread_destroy();
+
 	/* should destory the above mutex */
 	return rc;
 }
-