X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b8e676056aa6417be70f770610271556354ca815;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=0f658614ad3b4792c5c7df71fb16ae89e97817da;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 0f658614ad..b8e676056a 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-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,12 +38,26 @@ #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. */ int slap_debug = 0; +#ifdef LDAP_DEBUG +int ldap_syslog = LDAP_DEBUG_STATS; +#else +int ldap_syslog; +#endif + +#ifdef LOG_DEBUG +int ldap_syslog_level = LOG_DEBUG; +#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 ); @@ -51,22 +65,21 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS ); /* * global variables that need mutex protection */ -#ifdef LDAP_DEBUG -int ldap_syslog = LDAP_DEBUG_STATS; -#else -int ldap_syslog; +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; #endif -#ifdef LOG_DEBUG -int ldap_syslog_level = LOG_DEBUG; -#else -int ldap_syslog_level; -#endif +slap_counters_t slap_counters; /* * these mutexes must be used when calling the entry2str() * routine since it returns a pointer to static data. */ +ldap_pvt_thread_mutex_t entry2str_mutex; +ldap_pvt_thread_mutex_t replog_mutex; + static const char* slap_name = NULL; int slapMode = SLAP_UNDEFINED_MODE; @@ -90,44 +103,46 @@ slap_init( int mode, const char *name ) switch ( slapMode & SLAP_MODE ) { case SLAP_SERVER_MODE: + ldap_pvt_thread_pool_init( &connection_pool, + connection_pool_max, 0); + + /* 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( &SLAPD_GLOBAL(connection_pool), - SLAPD_GLOBAL(connection_pool_max), 0); + ldap_pvt_thread_mutex_init( &entry2str_mutex ); + ldap_pvt_thread_mutex_init( &replog_mutex ); - ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(entry2str_mutex) ); - ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(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_thread_mutex_init( &SLAPD_GLOBAL(counters).sc_sent_mutex ); - ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(counters).sc_ops_mutex ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_bytes ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_pdu ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_entries ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_refs ); + ldap_pvt_mp_init( slap_counters.sc_ops_initiated ); + ldap_pvt_mp_init( slap_counters.sc_ops_completed ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_completed ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_initiated ); + 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 for ( i = 0; i < SLAP_OP_LAST; i++ ) { - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] ); - ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_completed_[ 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( &SLAPD_GLOBAL(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(); @@ -163,7 +178,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 ); @@ -189,7 +204,7 @@ int slap_shutdown( Backend *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 */ @@ -205,8 +220,8 @@ int slap_destroy(void) "%s destroy: freeing system resources.\n", slap_name, 0, 0 ); - if ( SLAPD_GLOBAL(default_referral) ) { - ber_bvarray_free( SLAPD_GLOBAL(default_referral) ); + if ( default_referral ) { + ber_bvarray_free( default_referral ); } rc = backend_destroy(); @@ -219,19 +234,19 @@ int slap_destroy(void) case SLAP_SERVER_MODE: case SLAP_TOOL_MODE: - ldap_pvt_thread_mutex_destroy( &SLAPD_GLOBAL(counters).sc_sent_mutex ); - ldap_pvt_thread_mutex_destroy( &SLAPD_GLOBAL(counters).sc_ops_mutex ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_bytes ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_pdu ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_entries ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_refs ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_completed ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_initiated ); + 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( SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] ); - ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_completed_[ 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;