X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=a8a8e812ea6395eb670ac0fa24128dd1544d197a;hb=b94d5e17e22b58b990dac4d4af5319be915366a6;hp=0990d4b533bfa5f201ece1ffef1612042e9dd8c1;hpb=73b846c0112a78033b93f647b85f1bfaa5ee97f2;p=openldap
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 0990d4b533..a8a8e812ea 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 .
+ *
+ * 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
+ * .
+ */
+/* 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
#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,30 +50,40 @@ int ldap_syslog = LDAP_DEBUG_STATS;
int ldap_syslog;
#endif
+#ifdef LOG_DEBUG
int ldap_syslog_level = LOG_DEBUG;
-char *default_referral;
-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;
+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;
-long num_entries_sent;
-long num_bytes_sent;
+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()
@@ -54,62 +92,94 @@ 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;
+ 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;
- switch ( slapMode ) {
-
+ switch ( slapMode & SLAP_MODE ) {
case SLAP_SERVER_MODE:
case SLAP_TOOL_MODE:
-#ifdef SLAPD_BDB2
- case SLAP_TIMEDSERVER_MODE:
- case SLAP_TOOLID_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_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_pool_init( &connection_pool,
+ connection_pool_max, 0);
- 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 );
+#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 );
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_init( &crypt_mutex );
#endif
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+ ldap_pvt_thread_mutex_init( &passwd_mutex );
+#endif
+
+ rc = slap_sasl_init();
+
+ if( rc == 0 ) {
+ rc = backend_init( );
+ }
- 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 );
+ "%s init: undefined mode (%d).\n", name, mode, 0 );
+#endif
+
rc = 1;
break;
}
@@ -117,29 +187,59 @@ slap_init( int mode, char *name )
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 ( 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
+#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
/* 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;
}
@@ -148,24 +248,24 @@ 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();
+ slap_sasl_destroy();
+
+ entry_destroy();
+
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;
-}