X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=90f66152ea85758efc344eaf96c4d0394d7d3259;hb=014ba5ac80497d02b83514f30dabe3824e9facdc;hp=43af8d0a14d7f7b825a51f78ccc3315a874a012d;hpb=2cf83d84ee84ca04f1818cd81e71746b4d35bceb;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 43af8d0a14..90f66152ea 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,8 +13,8 @@ #include #include -#include "portable.h" #include "slap.h" +#include "lber_pvt.h" /* * read-only global variables or variables only written by the listener @@ -23,36 +28,38 @@ 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; + +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; - -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; - -long num_entries_sent; -long num_bytes_sent; +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; + +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,58 +68,149 @@ 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; +/* + * all known control OIDs should be added to this list + */ +char *slap_known_controls[] = { +#ifdef LDAP_CONTROL_REFERRALS + LDAP_CONTROL_REFERRALS, +#endif /* LDAP_CONTROL_REFERRALS */ + +#ifdef LDAP_CONTROL_MANAGEDSAIT + LDAP_CONTROL_MANAGEDSAIT, +#endif /* LDAP_CONTROL_MANAGEDSAIT */ + +#ifdef LDAP_CONTROL_SUBENTRIES + LDAP_CONTROL_SUBENTRIES, +#endif /* LDAP_CONTROL_SUBENTRIES */ + +#ifdef LDAP_CONTROL_NOOP + LDAP_CONTROL_NOOP, +#endif /* LDAP_CONTROL_NOOP */ + +#ifdef LDAP_CONTROL_DUPENT_REQUEST + LDAP_CONTROL_DUPENT_REQUEST, +#endif /* LDAP_CONTROL_DUPENT_REQUEST */ + +#ifdef LDAP_CONTROL_DUPENT_RESPONSE + LDAP_CONTROL_DUPENT_RESPONSE, +#endif /* LDAP_CONTROL_DUPENT_RESPONSE */ + +#ifdef LDAP_CONTROL_DUPENT_ENTRY + LDAP_CONTROL_DUPENT_ENTRY, +#endif /* LDAP_CONTROL_DUPENT_ENTRY */ + +#ifdef LDAP_CONTROL_PAGEDRESULTS + LDAP_CONTROL_PAGEDRESULTS, +#endif /* LDAP_CONTROL_PAGEDRESULTS */ + +#ifdef LDAP_CONTROL_SORTREQUEST + LDAP_CONTROL_SORTREQUEST, +#endif /* LDAP_CONTROL_SORTREQUEST */ + +#ifdef LDAP_CONTROL_SORTRESPONSE + LDAP_CONTROL_SORTRESPONSE, +#endif /* LDAP_CONTROL_SORTRESPONSE */ + +#ifdef LDAP_CONTROL_VLVREQUEST + LDAP_CONTROL_VLVREQUEST, +#endif /* LDAP_CONTROL_VLVREQUEST */ + +#ifdef LDAP_CONTROL_VLVRESPONSE + LDAP_CONTROL_VLVRESPONSE, +#endif /* LDAP_CONTROL_VLVRESPONSE */ + +#ifdef LDAP_CONTROL_VALUESRETURNFILTER + LDAP_CONTROL_VALUESRETURNFILTER, +#endif /* LDAP_CONTROL_VALUESRETURNFILTER */ + + NULL +}; + 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: +#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( &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_ops_mutex ); ldap_pvt_thread_mutex_init( &num_sent_mutex ); -#ifdef SLAPD_CRYPT - ldap_pvt_thread_mutex_init( &crypt_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 ); +#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; } @@ -120,29 +218,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); + + 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 + + + slap_sasl_destroy(); /* let backends do whatever cleanup they need to do */ - rc = backend_shutdown(dbnum); + rc = backend_shutdown( be ); return rc; } @@ -151,13 +262,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; } -