X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb2%2Finit.c;h=d1725f5f594f8a7dea1300ff5114eb91bfac5930;hb=4b65e74fa8ee7db3c42f4640700dd9464a26b0b3;hp=1bdbda54b2dd82a6f5340b735cc3210c4afa1877;hpb=42f6e78dd4e2d481c1bc75b8bc6d38fe9c62bc07;p=openldap

diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c
index 1bdbda54b2..d1725f5f59 100644
--- a/servers/slapd/back-bdb2/init.c
+++ b/servers/slapd/back-bdb2/init.c
@@ -23,7 +23,9 @@ 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;
 
 	bi->bi_private = bt;
 
@@ -121,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) );
@@ -169,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 )
@@ -192,23 +188,13 @@ bdb2_back_db_init(
     BackendDB	*be
 )
 {
-	struct timeval  time1, time2;
-	char   *elapsed_time;
-	int    ret;
+	struct timeval  time1;
+	int             ret;
 
-	gettimeofday( &time1, NULL );
+	bdb2i_start_timing( be->bd_info, &time1 );
 
 	ret = bdb2i_back_db_init_internal( be );
-
-	if ( bdb2i_do_timing ) {
-
-		gettimeofday( &time2, NULL);
-		elapsed_time = bdb2i_elapsed( time1, time2 );
-		Debug( LDAP_DEBUG_ANY, "DB-INIT elapsed=%s\n",
-				elapsed_time, 0, 0 );
-		free( elapsed_time );
-
-	}
+	bdb2i_stop_timing( be->bd_info, time1, "DB-INIT", NULL, NULL );
 
 	return( ret );
 }