X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=a9031b6f6ba50ab118664daf682d9218faa9b304;hb=331e6275418bda0735d4952f64d51518881d10a8;hp=ea9234ddd0dde82f776722934701a25c752efb3f;hpb=9c3ed0310bc6de304f58f74daf967e6d405a19a5;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index ea9234ddd0..a9031b6f6b 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -1,6 +1,7 @@ /* init.c - initialize various things */ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -13,6 +14,7 @@ #include #include "slap.h" +#include "lber_pvt.h" /* * read-only global variables or variables only written by the listener @@ -26,32 +28,38 @@ int ldap_syslog = LDAP_DEBUG_STATS; int ldap_syslog; #endif +#ifdef LOG_DEBUG int ldap_syslog_level = LOG_DEBUG; -struct berval **default_referral = NULL; -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; ldap_pvt_thread_mutex_t gmtime_mutex; -#ifdef SLAPD_CRYPT -ldap_pvt_thread_mutex_t crypt_mutex; +#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_refs_sent; -long num_bytes_sent; -long num_pdu_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() @@ -60,62 +68,90 @@ 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 + ldap_pvt_thread_mutex_init( &gmtime_mutex ); -#ifdef SLAPD_CRYPT - ldap_pvt_thread_mutex_init( &crypt_mutex ); +#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 ); + "%s init: undefined mode (%d).\n", name, mode, 0 ); +#endif + rc = 1; break; } @@ -123,35 +159,42 @@ 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); - if( rc == 0 ) { - rc = sasl_init(); - } + rc = backend_startup( be ); return rc; } -int slap_shutdown(int dbnum) +int slap_shutdown( Backend *be ) { int rc; +#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 - sasl_destroy(); + + slap_sasl_destroy(); /* let backends do whatever cleanup they need to do */ - rc = backend_shutdown(dbnum); + rc = backend_shutdown( be ); return rc; } @@ -160,24 +203,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; } - -/* 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; -}