X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=983dae921496162d9a44078dec9563c808cb04f5;hb=e25f6ef0cdd1780577dffeaca8ba8b19b5697880;hp=5f7e6a3ef82eee5a4aaf65ced7fd7e50e7522dca;hpb=216049bd12861357e0bf080fe10816103c3c3bda;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 5f7e6a3ef8..983dae9214 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -1,4 +1,9 @@ /* init.c - initialize various things */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" @@ -8,7 +13,6 @@ #include #include -#include "portable.h" #include "slap.h" /* @@ -23,36 +27,30 @@ 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; /* * 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; +ldap_pvt_thread_mutex_t gmtime_mutex; +#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; +unsigned long num_ops_initiated; +unsigned long num_ops_completed; +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() @@ -61,81 +59,123 @@ 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; -int slapMode = 0; +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; - if( slapMode ) { + assert( mode ); + + if( slapMode != SLAP_UNDEFINED_MODE ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_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) { - 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", LDAP_LEVEL_DETAIL1, + "init: %s initiation, initiated %s.\n", + name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" )); +#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( ¤ttime_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 ); + + ldap_pvt_thread_mutex_init( &gmtime_mutex ); +#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( ); + } + break; + + default: +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "init: %s init, undefined mode (%d).\n", name, mode )); +#else + Debug( LDAP_DEBUG_ANY, + "%s init: undefined mode (%d).\n", name, mode, 0 ); #endif - rc = backend_init(); + rc = 1; + break; + } return rc; } -int slap_startup(int dbnum) +int slap_startup( Backend *be ) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "slap_startup: %s started\n", slap_name )); +#else Debug( LDAP_DEBUG_TRACE, "%s startup: initiated.\n", slap_name, 0, 0 ); +#endif + - rc = backend_startup(dbnum); + rc = backend_startup( be ); return rc; } -int slap_shutdown(int dbnum) +int slap_shutdown( Backend *be ) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "slap_shutdown: %s shutdown initiated.\n", slap_name)); +#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 ); return rc; } @@ -144,13 +184,23 @@ int slap_destroy(void) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "slap_destroy: %s freeing system resources.\n", + slap_name )); +#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; } -