X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb2%2Finit.c;h=d1725f5f594f8a7dea1300ff5114eb91bfac5930;hb=4b65e74fa8ee7db3c42f4640700dd9464a26b0b3;hp=eaa557f9deacde44c7a5c598322b5c3fc89e54f2;hpb=548942edbea2f494cb7e69af900e98af0d8875ae;p=openldap diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c index eaa557f9de..d1725f5f59 100644 --- a/servers/slapd/back-bdb2/init.c +++ b/servers/slapd/back-bdb2/init.c @@ -23,7 +23,6 @@ bdb2i_back_init_private( bt->lty_dbhome = DEFAULT_DB_HOME; bt->lty_mpsize = DEFAULT_DBCACHE_SIZE; - bt->lty_dbenv = &ldbm_Env; if ( slapMode == SLAP_TIMEDSERVER_MODE ) bt->lty_betiming = 1; @@ -124,7 +123,6 @@ bdb2i_back_db_init_internal( { struct ldbminfo *li; char *argv[ 4 ]; - int i; /* allocate backend-database-specific stuff */ li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) ); @@ -172,13 +170,8 @@ bdb2i_back_db_init_internal( 1 ); free( argv[ 1 ] ); - /* initialize various mutex locks & condition variables */ - ldap_pvt_thread_mutex_init( &li->li_root_mutex ); - ldap_pvt_thread_mutex_init( &li->li_add_mutex ); + /* initialize the cache mutex */ ldap_pvt_thread_mutex_init( &li->li_cache.c_mutex ); - ldap_pvt_thread_mutex_init( &li->li_nextid_mutex ); - ldap_pvt_thread_mutex_init( &li->li_dbcache_mutex ); - ldap_pvt_thread_cond_init( &li->li_dbcache_cv ); /* initialize the TP file head */ if ( bdb2i_txn_head_init( &li->li_txn_head ) != 0 )