X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b8e676056aa6417be70f770610271556354ca815;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=c1dcae2a8a7d1b4c411dce19d0e7cf4ee0292d97;hpb=c3c881976a919c4e8a9709310cd83ac620e40769;p=openldap
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index c1dcae2a8a..b8e676056a 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,8 +1,27 @@
/* init.c - initialize various things */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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"
@@ -16,9 +35,11 @@
#include "slap.h"
#include "lber_pvt.h"
#ifdef LDAP_SLAPI
-#include "slapi.h"
+#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.
@@ -46,24 +67,12 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
*/
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;
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-ldap_pvt_thread_mutex_t passwd_mutex;
#endif
-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;
+slap_counters_t slap_counters;
-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()
* routine since it returns a pointer to static data.
@@ -78,19 +87,14 @@ int
slap_init( int mode, const char *name )
{
int rc;
+ int i;
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
+ if ( slapMode != SLAP_UNDEFINED_MODE ) {
Debug( LDAP_DEBUG_ANY,
"%s init: init called twice (old=%d, new=%d)\n",
name, slapMode, mode );
-#endif
return 1;
}
@@ -98,66 +102,62 @@ slap_init( int mode, const char *name )
slapMode = mode;
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
+ 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 );
- slap_name = name;
-
- (void) ldap_pvt_thread_initialize();
+ 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_pool_init(&connection_pool, connection_pool_max, 0);
+ ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
+ ldap_pvt_mp_init( slap_counters.sc_ops_completed );
- 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( &slapd_rq.rq_mutex );
+ LDAP_STAILQ_INIT( &slapd_rq.task_list );
+ LDAP_STAILQ_INIT( &slapd_rq.run_list );
#ifdef SLAPD_MONITOR
- {
- int i;
- for ( i = 0; i < SLAP_OP_LAST; i++ ) {
- num_ops_initiated_[ i ] = 0;
- num_ops_completed_[ i ] = 0;
- }
- }
-#endif
+ 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 */
- ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
- ldap_pvt_thread_mutex_init( &passwd_mutex );
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_init( &gmtime_mutex );
#endif
+ slap_passwd_init();
- rc = slap_sasl_init();
+ rc = slap_sasl_init();
- if( rc == 0 ) {
- rc = backend_init( );
- }
+ if( rc == 0 ) {
+ rc = backend_init( );
+ }
- break;
+ 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
+ default:
+ Debug( LDAP_DEBUG_ANY,
+ "%s init: undefined mode (%d).\n", name, mode, 0 );
- rc = 1;
- break;
+ rc = 1;
+ break;
}
return rc;
@@ -167,13 +167,9 @@ 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( be );
@@ -182,7 +178,7 @@ int slap_startup( Backend *be )
if( rc == 0 ) {
Slapi_PBlock *pb = slapi_pblock_new();
- if ( doPluginFNs( 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 );
@@ -199,24 +195,16 @@ int slap_shutdown( Backend *be )
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( be );
#ifdef LDAP_SLAPI
- pb = slapi_pblock_new( );
- (void) doPluginFNs( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+ pb = slapi_pblock_new();
+ (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
slapi_pblock_destroy( pb );
#endif /* LDAP_SLAPI */
@@ -226,21 +214,52 @@ int slap_shutdown( Backend *be )
int slap_destroy(void)
{
int rc;
+ int i;
-#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",
+ "%s destroy: freeing system resources.\n",
slap_name, 0, 0 );
-#endif
+ 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 */