X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b8e676056aa6417be70f770610271556354ca815;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=f9020726bced8d235c9fe8c20b59a51371ceea5d;hpb=d5edb4bff62150cf35e8b9c59798017ff58febc0;p=openldap
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index f9020726bc..b8e676056a 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,8 +1,27 @@
/* init.c - initialize various things */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
+ */
+/* 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"
@@ -14,6 +33,12 @@
#include
#include "slap.h"
+#include "lber_pvt.h"
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
+
+#include "ldap_rq.h"
/*
* read-only global variables or variables only written by the listener
@@ -31,32 +56,23 @@ int ldap_syslog;
int ldap_syslog_level = LOG_DEBUG;
#endif
-struct berval **default_referral = NULL;
-int g_argc;
-char **g_argv;
+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
-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.
@@ -64,60 +80,84 @@ 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 = NULL;
+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 & SLAP_MODE ) {
- case SLAP_SERVER_MODE:
- case SLAP_TOOL_MODE:
- 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( ¤ttime_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_thread_mutex_init( &gmtime_mutex );
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_init( &crypt_mutex );
+ 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_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_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++ ) {
+ 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
+ slap_passwd_init();
+ rc = slap_sasl_init();
+
+ if( rc == 0 ) {
rc = backend_init( );
- break;
+ }
+
+ break;
+
+ default:
+ Debug( LDAP_DEBUG_ANY,
+ "%s init: undefined mode (%d).\n", name, mode, 0 );
- default:
- Debug( LDAP_DEBUG_ANY,
- "%s init: undefined mode (%d).\n", name, mode, 0 );
- rc = 1;
- break;
+ rc = 1;
+ break;
}
return rc;
@@ -131,13 +171,19 @@ int slap_startup( Backend *be )
"%s startup: initiated.\n",
slap_name, 0, 0 );
+
rc = backend_startup( be );
+#ifdef LDAP_SLAPI
if( rc == 0 ) {
- rc = sasl_init();
- }
+ Slapi_PBlock *pb = slapi_pblock_new();
- slap_passwd_init();
+ if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+ rc = -1;
+ }
+ slapi_pblock_destroy( pb );
+ }
+#endif /* LDAP_SLAPI */
return rc;
}
@@ -145,43 +191,77 @@ int slap_startup( Backend *be )
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( be );
+#ifdef LDAP_SLAPI
+ pb = slapi_pblock_new();
+ (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
+ slapi_pblock_destroy( pb );
+#endif /* LDAP_SLAPI */
+
return rc;
}
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_initiated );
+ ldap_pvt_mp_clear( slap_counters.sc_ops_completed );
+
+#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( ¤ttime_mutex );
- time( &t );
- ldap_pvt_thread_mutex_unlock( ¤ttime_mutex );
- return t;
-}