X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=8cf3c7ae0e1fe3fc1874f783b5fe47cf1f68c278;hb=a4d161cff64c74e03e5898eae104d5d52cc54a91;hp=1c9e947b75ef5f10e6af6c8991cbb20f254598ef;hpb=f7d8d55d8466d73fe961da738b54704009fce72f;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 1c9e947b75..8cf3c7ae0e 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,6 +38,8 @@ #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. @@ -65,26 +67,13 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS ); */ ldap_pvt_thread_pool_t connection_pool; int connection_pool_max = SLAP_MAX_WORKER_THREADS; +int slap_tool_thread_max = 1; #ifndef HAVE_GMTIME_R ldap_pvt_thread_mutex_t gmtime_mutex; #endif -#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. @@ -99,89 +88,151 @@ 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 ) { + /* Make sure we write something to stderr */ + slap_debug |= LDAP_DEBUG_NONE; Debug( LDAP_DEBUG_ANY, "%s init: init called twice (old=%d, new=%d)\n", name, slapMode, mode ); -#endif return 1; } 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 ); +#ifdef SLAPD_MODULES + if ( module_init() != 0 ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: module_init failed\n", + name, 0, 0 ); + return 1; + } #endif + if ( slap_schema_init( ) != 0 ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: slap_schema_init failed\n", + name, 0, 0 ); + return 1; + } - slap_name = name; - - (void) ldap_pvt_thread_initialize(); - ldap_pvt_thread_pool_init( &connection_pool, + switch ( slapMode & SLAP_MODE ) { + case SLAP_SERVER_MODE: + + /* 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_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( &entry2str_mutex ); + ldap_pvt_thread_mutex_init( &replog_mutex ); + + 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_mp_init( slap_counters.sc_ops_initiated ); + ldap_pvt_mp_init( slap_counters.sc_ops_completed ); + + 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 */ #ifndef HAVE_GMTIME_R - ldap_pvt_thread_mutex_init( &gmtime_mutex ); -#endif -#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) - ldap_pvt_thread_mutex_init( &passwd_mutex ); + 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 ); + default: + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s init: undefined mode (%d).\n", name, mode, 0 ); + + rc = 1; + break; + } + + if ( slap_controls_init( ) != 0 ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: slap_controls_init failed\n", + name, 0, 0 ); + return 1; + } + +#ifdef HAVE_TLS + /* Library defaults to full certificate checking. This is correct when + * a client is verifying a server because all servers should have a + * valid cert. But few clients have valid certs, so we want our default + * to be no checking. The config file can override this as usual. + */ + rc = 0; + (void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc ); #endif - rc = 1; - break; + if ( frontend_init() ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: frontend_init failed\n", + name, 0, 0 ); + return 1; + } + + if ( overlay_init() ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: overlay_init failed\n", + name, 0, 0 ); + return 1; + } + + if ( glue_sub_init() ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: glue/subordinate init failed\n", + name, 0, 0 ); + + return 1; + } + + if ( acl_init() ) { + slap_debug |= LDAP_DEBUG_NONE; + Debug( LDAP_DEBUG_ANY, + "%s: acl_init failed\n", + name, 0, 0 ); + return 1; } return rc; @@ -191,13 +242,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 ); @@ -206,7 +253,7 @@ int slap_startup( Backend *be ) if( rc == 0 ) { Slapi_PBlock *pb = slapi_pblock_new(); - if ( slapi_int_call_plugins( 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 ); @@ -223,24 +270,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) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb ); + (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb ); slapi_pblock_destroy( pb ); #endif /* LDAP_SLAPI */ @@ -250,21 +289,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 */