X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fcache.c;h=d6dd3661657ccd2801d6ad2af4d71d8c7df8b391;hb=c59f0869ec670a8b2f58cb69a5c92202fd33f0c3;hp=8a6e1b3cbaf0f83af2dbfbe35657f2072d847378;hpb=61eec0734af3f2ce70bc2a78677cbd91ab457fcb;p=openldap

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index 8a6e1b3cba..d6dd366165 100644
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -1,8 +1,17 @@
 /* cache.c - routines to maintain an in-core cache of entries */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -23,18 +32,31 @@ static void	bdb_lru_print(Cache *cache);
 #endif
 
 static EntryInfo *
-bdb_cache_entryinfo_new( )
+bdb_cache_entryinfo_new( Cache *cache )
 {
-	EntryInfo *ei;
+	EntryInfo *ei = NULL;
 
-	ei = ch_calloc(1, sizeof(struct bdb_entry_info));
-	ldap_pvt_thread_mutex_init( &ei->bei_kids_mutex );
+	if ( cache->c_eifree ) {
+		ldap_pvt_thread_rdwr_wlock( &cache->c_rwlock );
+		if ( cache->c_eifree ) {
+			ei = cache->c_eifree;
+			cache->c_eifree = ei->bei_lrunext;
+		}
+		ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+	}
+	if ( ei ) {
+		ei->bei_lrunext = NULL;
+		ei->bei_state = 0;
+	} else {
+		ei = ch_calloc(1, sizeof(struct bdb_entry_info));
+		ldap_pvt_thread_mutex_init( &ei->bei_kids_mutex );
+	}
 
 	return ei;
 }
 
 /* Atomically release and reacquire a lock */
-static int
+int
 bdb_cache_entry_db_relock(
 	DB_ENV *env,
 	u_int32_t locker,
@@ -80,9 +102,10 @@ bdb_cache_entry_db_relock(
 	return rc;
 #endif
 }
+
 static int
-bdb_cache_entry_db_lock
-( DB_ENV *env, u_int32_t locker, EntryInfo *ei, int rw, int tryOnly, DB_LOCK *lock )
+bdb_cache_entry_db_lock( DB_ENV *env, u_int32_t locker, EntryInfo *ei,
+	int rw, int tryOnly, DB_LOCK *lock )
 {
 #ifdef NO_THREADS
 	return 0;
@@ -119,14 +142,15 @@ bdb_cache_entry_db_lock
 }
 
 int
-bdb_cache_entry_db_unlock
-( DB_ENV *env, DB_LOCK *lock )
+bdb_cache_entry_db_unlock ( DB_ENV *env, DB_LOCK *lock )
 {
 #ifdef NO_THREADS
 	return 0;
 #else
 	int rc;
 
+	if ( !lock ) return 0;
+
 	rc = LOCK_PUT ( env, lock );
 	return rc;
 #endif
@@ -175,8 +199,10 @@ bdb_rdn_cmp( const void *v_e1, const void *v_e2 )
 {
 	const EntryInfo *e1 = v_e1, *e2 = v_e2;
 	int rc = e1->bei_nrdn.bv_len - e2->bei_nrdn.bv_len;
-	if (rc == 0) rc = strncmp( e1->bei_nrdn.bv_val, e2->bei_nrdn.bv_val,
-		e1->bei_nrdn.bv_len );
+	if (rc == 0) {
+		rc = strncmp( e1->bei_nrdn.bv_val, e2->bei_nrdn.bv_val,
+			e1->bei_nrdn.bv_len );
+	}
 	return rc;
 }
 
@@ -193,89 +219,17 @@ static int
 bdb_entryinfo_add_internal(
 	struct bdb_info *bdb,
 	EntryInfo *ei,
-	EntryInfo **res,
-	u_int32_t locker
-)
+	EntryInfo **res )
 {
-	Cache *cache = &bdb->bi_cache;
-	DB_ENV *env = bdb->bi_dbenv;
 	EntryInfo *ei2 = NULL;
-	int incr = 1;
-	int addkid = 1;
-	int rc;
-	DB_LOCK lock;
 
 	*res = NULL;
 
+	ei2 = bdb_cache_entryinfo_new( &bdb->bi_cache );
+
 	ldap_pvt_thread_rdwr_wlock( &bdb->bi_cache.c_rwlock );
 	bdb_cache_entryinfo_lock( ei->bei_parent );
 
-	/* if parent was previously considered a leaf node,
-	 * it was on the LRU list. Now it's going to have
-	 * kids, take it off the LRU list.
-	 */
-	ldap_pvt_thread_mutex_lock( &cache->lru_mutex );
-	if ( ei->bei_parent->bei_id && !ei->bei_parent->bei_kids ) {
-		LRU_DELETE( cache, ei->bei_parent );
-		incr = 0;
-	}
-
-	cache->c_cursize += incr;
-
-	/* See if we're above the cache size limit */
-	if ( cache->c_cursize > cache->c_maxsize ) {
-		EntryInfo *elru, *elprev;
-		int i = 0;
-
-		/* Look for an unused entry to remove */
-		for (elru = cache->c_lrutail; elru; elru = elprev, i++ ) {
-			elprev = elru->bei_lruprev;
-
-			/* Too many probes, not enough idle, give up */
-			if (i > 10) break;
-
-			/* If we can successfully writelock it, then
-			 * the object is idle.
-			 */
-			if ( bdb_cache_entry_db_lock( env, locker, elru, 1, 1,
-				&lock ) == 0 ) {
-				/* Need to lock parent to delete child */
-				if ( ldap_pvt_thread_mutex_trylock(
-					&elru->bei_parent->bei_kids_mutex )) {
-					bdb_cache_entry_db_unlock( env, &lock );
-					continue;
-				}
-				bdb_cache_delete_internal( cache, elru );
-				bdb_cache_entryinfo_unlock( elru->bei_parent );
-				elru->bei_e->e_private = NULL;
-				bdb_entry_return( elru->bei_e );
-				bdb_cache_entry_db_unlock( env, &lock );
-				if (ei2) {
-					bdb_cache_entryinfo_destroy( elru );
-				} else {
-					/* re-use this one */
-					ch_free(elru->bei_nrdn.bv_val);
-					elru->bei_nrdn.bv_val = NULL;
-					elru->bei_e = NULL;
-					elru->bei_kids = NULL;
-					elru->bei_lrunext = NULL;
-					elru->bei_lruprev = NULL;
-					elru->bei_state = 0;
-#ifdef BDB_HIER
-					ch_free(elru->bei_rdn.bv_val);
-					elru->bei_rdn.bv_val = NULL;
-					elru->bei_modrdns = 0;
-#endif
-					ei2 = elru;
-				}
-				if (cache->c_cursize < cache->c_maxsize)
-					break;
-			}
-		}
-	}
-	if (!ei2) {
-		ei2 = bdb_cache_entryinfo_new();
-	}
 	ei2->bei_id = ei->bei_id;
 	ei2->bei_parent = ei->bei_parent;
 #ifdef BDB_HIER
@@ -283,13 +237,11 @@ bdb_entryinfo_add_internal(
 #endif
 
 	/* Add to cache ID tree */
-	if (avl_insert( &cache->c_idtree, ei2, bdb_id_cmp, avl_dup_error )) {
+	if (avl_insert( &bdb->bi_cache.c_idtree, ei2, bdb_id_cmp, avl_dup_error )) {
 		EntryInfo *eix;
-		eix = avl_find( cache->c_idtree, ei2, bdb_id_cmp );
+		eix = avl_find( bdb->bi_cache.c_idtree, ei2, bdb_id_cmp );
 		bdb_cache_entryinfo_destroy( ei2 );
 		ei2 = eix;
-		addkid = 0;
-		cache->c_cursize -= incr;
 #ifdef BDB_HIER
 		/* It got freed above because its value was
 		 * assigned to ei2.
@@ -297,17 +249,14 @@ bdb_entryinfo_add_internal(
 		ei->bei_rdn.bv_val = NULL;
 #endif
 	} else {
-		LRU_ADD( cache, ei2 );
 		ber_dupbv( &ei2->bei_nrdn, &ei->bei_nrdn );
-	}
-
-	if ( addkid ) {
 		avl_insert( &ei->bei_parent->bei_kids, ei2, bdb_rdn_cmp,
 			avl_dup_error );
+#ifdef BDB_HIER
+		ei->bei_parent->bei_ckids++;
+#endif
 	}
 
-	ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
-
 	*res = ei2;
 	return 0;
 }
@@ -320,15 +269,12 @@ bdb_entryinfo_add_internal(
  */
 int
 bdb_cache_find_ndn(
-	Backend		*be,
+	Operation	*op,
 	DB_TXN		*txn,
 	struct berval	*ndn,
-	EntryInfo	**res,
-	u_int32_t	locker,
-	void		*ctx
-)
+	EntryInfo	**res )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	EntryInfo	ei, *eip, *ei2;
 	int rc = 0;
 	char *ptr;
@@ -337,13 +283,13 @@ bdb_cache_find_ndn(
 	if ( *res ) {
 		/* we're doing a onelevel search for an RDN */
 		ei.bei_nrdn.bv_val = ndn->bv_val;
-		ei.bei_nrdn.bv_len = dn_rdnlen( be, ndn );
+		ei.bei_nrdn.bv_len = dn_rdnlen( op->o_bd, ndn );
 		eip = *res;
 	} else {
 		/* we're searching a full DN from the root */
-		ptr = ndn->bv_val + ndn->bv_len - be->be_nsuffix[0].bv_len;
+		ptr = ndn->bv_val + ndn->bv_len - op->o_bd->be_nsuffix[0].bv_len;
 		ei.bei_nrdn.bv_val = ptr;
-		ei.bei_nrdn.bv_len = be->be_nsuffix[0].bv_len;
+		ei.bei_nrdn.bv_len = op->o_bd->be_nsuffix[0].bv_len;
 		eip = &bdb->bi_cache.c_dntree;
 	}
 	
@@ -353,10 +299,11 @@ bdb_cache_find_ndn(
 		if ( !ei2 ) {
 			int len = ei.bei_nrdn.bv_len;
 				
-			ei.bei_nrdn.bv_len = ndn->bv_len - (ei.bei_nrdn.bv_val - ndn->bv_val);
+			ei.bei_nrdn.bv_len = ndn->bv_len -
+				(ei.bei_nrdn.bv_val - ndn->bv_val);
 			bdb_cache_entryinfo_unlock( eip );
 
-			rc = bdb_dn2id( be, txn, &ei.bei_nrdn, &ei, ctx );
+			rc = bdb_dn2id( op, txn, &ei.bei_nrdn, &ei );
 			if (rc) {
 				bdb_cache_entryinfo_lock( eip );
 				*res = eip;
@@ -365,8 +312,7 @@ bdb_cache_find_ndn(
 
 			/* DN exists but needs to be added to cache */
 			ei.bei_nrdn.bv_len = len;
-			rc = bdb_entryinfo_add_internal( bdb, &ei, &ei2,
-				locker );
+			rc = bdb_entryinfo_add_internal( bdb, &ei, &ei2 );
 			/* add_internal left eip and c_rwlock locked */
 			ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
 			if ( rc ) {
@@ -390,7 +336,7 @@ bdb_cache_find_ndn(
 
 		/* Advance to next lower RDN */
 		for (ptr = ei.bei_nrdn.bv_val - 2; ptr > ndn->bv_val
-			&& !DN_SEPARATOR(*ptr); ptr--);
+			&& !DN_SEPARATOR(*ptr); ptr--) /* empty */;
 		if ( ptr >= ndn->bv_val ) {
 			if (DN_SEPARATOR(*ptr)) ptr++;
 			ei.bei_nrdn.bv_len = ei.bei_nrdn.bv_val - ptr - 1;
@@ -410,31 +356,31 @@ bdb_cache_find_ndn(
  * been linked into the cache.
  */
 static int
-bdb_cache_find_parent(
-	Backend *be,
+hdb_cache_find_parent(
+	Operation *op,
 	DB_TXN *txn,
 	ID id,
-	EntryInfo **res,
-	void *ctx
-)
+	EntryInfo **res )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	EntryInfo ei, eip, *ei2 = NULL, *ein = NULL, *eir = NULL;
+	char ndn[SLAP_LDAPDN_MAXLEN];
 	ID parent;
 	int rc;
+	int addlru = 1;
 
 	ei.bei_id = id;
 	ei.bei_kids = NULL;
 
 	for (;;) {
-		rc = bdb_dn2id_parent( be, txn, &ei, &eip.bei_id, ctx );
+		rc = hdb_dn2id_parent( op, txn, &ei, &eip.bei_id );
 		if ( rc ) break;
 
 		/* Save the previous node, if any */
 		ei2 = ein;
 
 		/* Create a new node for the current ID */
-		ein = bdb_cache_entryinfo_new();
+		ein = bdb_cache_entryinfo_new( &bdb->bi_cache );
 		ein->bei_id = ei.bei_id;
 		ein->bei_kids = ei.bei_kids;
 		ein->bei_nrdn = ei.bei_nrdn;
@@ -444,20 +390,28 @@ bdb_cache_find_parent(
 		ein->bei_state = CACHE_ENTRY_NOT_LINKED;
 
 		/* Insert this node into the ID tree */
-		ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
+		ldap_pvt_thread_rdwr_wlock( &bdb->bi_cache.c_rwlock );
 		if ( avl_insert( &bdb->bi_cache.c_idtree, (caddr_t)ein,
 			bdb_id_cmp, avl_dup_error ) ) {
 
-			/* Hm, can this really happen? */
+			/* Someone else created this node just before us.
+			 * Free our new copy and use the existing one.
+			 */
 			bdb_cache_entryinfo_destroy( ein );
 			ein = (EntryInfo *)avl_find( bdb->bi_cache.c_idtree,
 				(caddr_t) &ei, bdb_id_cmp );
+			
+			/* Link in any kids we've already processed */
 			if ( ei2 ) {
 				bdb_cache_entryinfo_lock( ein );
 				avl_insert( &ein->bei_kids, (caddr_t)ei2,
 					bdb_rdn_cmp, avl_dup_error );
 				bdb_cache_entryinfo_unlock( ein );
 			}
+
+			if ( !eir ) {
+				addlru = 0;
+			}
 		}
 
 		/* If this is the first time, save this node
@@ -468,27 +422,28 @@ bdb_cache_find_parent(
 		/* If there was a previous node, link it to this one */
 		if ( ei2 ) ei2->bei_parent = ein;
 
+		/* Look for this node's parent */
 		if ( eip.bei_id ) {
 			ei2 = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree,
 					(caddr_t) &eip, bdb_id_cmp );
 		} else {
 			ei2 = &bdb->bi_cache.c_dntree;
 		}
+		ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
 
+		/* Got the parent, link in and we're done. */
 		if ( ei2 ) {
-			ein->bei_parent = ei2;
 			bdb_cache_entryinfo_lock( ei2 );
+			ein->bei_parent = ei2;
 			avl_insert( &ei2->bei_kids, (caddr_t)ein, bdb_rdn_cmp,
 				avl_dup_error);
 			bdb_cache_entryinfo_unlock( ei2 );
-			*res = eir;
 			bdb_cache_entryinfo_lock( eir );
-		}
-		ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
-		if ( ei2 ) {
-			/* Found a link. Reset all the state info */
+
+			/* Reset all the state info */
 			for (ein = eir; ein != ei2; ein=ein->bei_parent)
 				ein->bei_state &= ~CACHE_ENTRY_NOT_LINKED;
+			*res = eir;
 			break;
 		}
 		ei.bei_kids = NULL;
@@ -498,8 +453,116 @@ bdb_cache_find_parent(
 	}
 	return rc;
 }
+
+/* Used by hdb_dn2idl when loading the EntryInfo for all the children
+ * of a given node
+ */
+int hdb_cache_load(
+	struct bdb_info *bdb,
+	EntryInfo *ei,
+	EntryInfo **res )
+{
+	EntryInfo *ei2;
+	int rc;
+
+	/* See if we already have this one */
+	bdb_cache_entryinfo_lock( ei->bei_parent );
+	ei2 = (EntryInfo *)avl_find( ei->bei_parent->bei_kids, ei, bdb_rdn_cmp );
+	bdb_cache_entryinfo_unlock( ei->bei_parent );
+
+	if ( !ei2 ) {
+		/* Not found, add it */
+		struct berval bv;
+
+		/* bei_rdn was not malloc'd before, do it now */
+		ber_dupbv( &bv, &ei->bei_rdn );
+		ei->bei_rdn = bv;
+
+		rc = bdb_entryinfo_add_internal( bdb, ei, res );
+		bdb_cache_entryinfo_unlock( ei->bei_parent );
+		ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
+	} else {
+		/* Found, return it */
+		*res = ei2;
+		return 0;
+	}
+	return rc;
+}
 #endif
 
+/* caller must have lru_mutex locked. mutex
+ * will be unlocked on return.
+ */
+static void
+bdb_cache_lru_add(
+	struct bdb_info *bdb,
+	u_int32_t	locker,
+	EntryInfo *ei )
+{
+	DB_LOCK		lock, *lockp;
+
+	if ( locker ) {
+		lockp = &lock;
+	} else {
+		lockp = NULL;
+	}
+
+	/* See if we're above the cache size limit */
+	if ( bdb->bi_cache.c_cursize > bdb->bi_cache.c_maxsize ) {
+		EntryInfo *elru, *elprev;
+		int i = 0;
+
+		/* Look for an unused entry to remove */
+		for (elru = bdb->bi_cache.c_lrutail; elru; elru = elprev, i++ ) {
+			elprev = elru->bei_lruprev;
+
+			/* Too many probes, not enough idle, give up */
+			if (i > 10) break;
+
+			/* If we can successfully writelock it, then
+			 * the object is idle.
+			 */
+			if ( bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, elru, 1, 1,
+				lockp ) == 0 ) {
+				/* If there's no entry, or this node is in
+				 * the process of linking into the cache,
+				 * skip it.
+				 */
+				if ( !elru->bei_e || (elru->bei_state & CACHE_ENTRY_NOT_LINKED) ) {
+					bdb_cache_entry_db_unlock( bdb->bi_dbenv, lockp );
+					continue;
+				}
+				LRU_DELETE( &bdb->bi_cache, elru );
+				elru->bei_e->e_private = NULL;
+				bdb_entry_return( elru->bei_e );
+				elru->bei_e = NULL;
+				bdb_cache_entry_db_unlock( bdb->bi_dbenv, lockp );
+				--bdb->bi_cache.c_cursize;
+				if (bdb->bi_cache.c_cursize < bdb->bi_cache.c_maxsize)
+					break;
+			}
+		}
+	}
+	LRU_ADD( &bdb->bi_cache, ei );
+	ldap_pvt_thread_mutex_unlock( &bdb->bi_cache.lru_mutex );
+}
+
+EntryInfo *
+bdb_cache_find_info(
+	struct bdb_info *bdb,
+	ID id )
+{
+	EntryInfo ei, *ei2;
+
+	ei.bei_id = id;
+
+	ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
+	ei2 = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree,
+					(caddr_t) &ei, bdb_id_cmp );
+	ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
+	return ei2;
+}
+
 /*
  * cache_find_id - find an entry in the cache, given id.
  * The entry is locked for Read upon return. Call with islocked TRUE if
@@ -508,30 +571,51 @@ bdb_cache_find_parent(
 
 int
 bdb_cache_find_id(
-	Backend *be,
+	Operation *op,
 	DB_TXN	*tid,
 	ID				id,
 	EntryInfo	**eip,
 	int		islocked,
 	u_int32_t	locker,
-	DB_LOCK		*lock,
-	void		*ctx
-)
+	DB_LOCK		*lock )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	Entry	*ep = NULL;
 	int	rc = 0;
 	EntryInfo ei;
+	int lru_del = 0;
 
 	ei.bei_id = id;
 
 	/* If we weren't given any info, see if we have it already cached */
 	if ( !*eip ) {
-		ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
+again:	ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
 		*eip = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree,
-					(caddr_t) &ei, bdb_id_cmp );
+			(caddr_t) &ei, bdb_id_cmp );
 		if ( *eip ) {
-			bdb_cache_entryinfo_lock( *eip );
+			/* If the lock attempt fails, the info is in use */
+			if ( ldap_pvt_thread_mutex_trylock(
+					&(*eip)->bei_kids_mutex )) {
+				ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
+				/* If this node is being deleted, treat
+				 * as if the delete has already finished
+				 */
+				if ( (*eip)->bei_state & CACHE_ENTRY_DELETED ) {
+					return DB_NOTFOUND;
+				}
+				/* otherwise, wait for the info to free up */
+				ldap_pvt_thread_yield();
+				goto again;
+			}
+			/* If this info isn't hooked up to its parent yet,
+			 * unlock and wait for it to be fully initialized
+			 */
+			if ( (*eip)->bei_state & CACHE_ENTRY_NOT_LINKED ) {
+				bdb_cache_entryinfo_unlock( *eip );
+				ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
+				ldap_pvt_thread_yield();
+				goto again;
+			}
 			islocked = 1;
 		}
 		ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
@@ -540,21 +624,19 @@ bdb_cache_find_id(
 	/* See if the ID exists in the database; add it to the cache if so */
 	if ( !*eip ) {
 #ifndef BDB_HIER
-		rc = bdb_id2entry( be, tid, id, &ep );
+		rc = bdb_id2entry( op->o_bd, tid, id, &ep );
 		if ( rc == 0 ) {
-			rc = bdb_cache_find_ndn( be, tid,
-				&ep->e_nname, eip, locker, ctx );
-			if ( *eip )
-				islocked = 1;
+			rc = bdb_cache_find_ndn( op, tid,
+				&ep->e_nname, eip );
+			if ( *eip ) islocked = 1;
 			if ( rc ) {
 				bdb_entry_return( ep );
 				ep = NULL;
 			}
 		}
 #else
-		rc = bdb_cache_find_parent(be, tid, id, eip, ctx );
-		if ( rc == 0 && *eip )
-			islocked = 1;
+		rc = hdb_cache_find_parent(op, tid, id, eip );
+		if ( rc == 0 && *eip ) islocked = 1;
 #endif
 	}
 
@@ -562,46 +644,61 @@ bdb_cache_find_id(
 	if ( *eip && rc == 0 ) {
 		if ( (*eip)->bei_state & CACHE_ENTRY_DELETED ) {
 			rc = DB_NOTFOUND;
-		} else if (!(*eip)->bei_e ) {
-			if (!ep) {
-				rc = bdb_id2entry( be, tid, id, &ep );
-			}
-			if ( rc == 0 ) {
-				bdb_cache_entry_db_lock( bdb->bi_dbenv, locker,
-					*eip, 1, 0, lock );
-				ep->e_private = *eip;
-#ifdef BDB_HIER
-				bdb_fix_dn( ep, 0 );
-#endif
-				(*eip)->bei_e = ep;
-				bdb_cache_entry_db_relock( bdb->bi_dbenv, locker,
-					*eip, 0, 0, lock );
-			}
 		} else {
+			bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, *eip, 0, 0, lock );
+			if ( !(*eip)->bei_e ) {
+				if (!ep) {
+					rc = bdb_id2entry( op->o_bd, tid, id, &ep );
+				}
+				if ( rc == 0 ) {
+					bdb_cache_entry_db_relock( bdb->bi_dbenv, locker,
+						*eip, 1, 0, lock );
+					/* Make sure no other modifier beat us to it */
+					if ( (*eip)->bei_e ) {
+						bdb_entry_return( ep );
+						ep = NULL;
+					} else {
+						ep->e_private = *eip;
 #ifdef BDB_HIER
-			rc = bdb_fix_dn( (*eip)->bei_e, 1 );
-			if ( rc ) {
-				bdb_cache_entry_db_lock( bdb->bi_dbenv,
-					locker, *eip, 1, 0, lock );
-				rc = bdb_fix_dn( (*eip)->bei_e, 2 );
-				bdb_cache_entry_db_relock( bdb->bi_dbenv,
-					locker, *eip, 0, 0, lock );
+						bdb_fix_dn( ep, 0 );
+#endif
+						(*eip)->bei_e = ep;
+					}
+					bdb_cache_entry_db_relock( bdb->bi_dbenv, locker,
+						*eip, 0, 0, lock );
+				}
 			} else {
-				bdb_cache_entry_db_lock( bdb->bi_dbenv,
-					locker, *eip, 0, 0, lock );
-			}
-#else
-			bdb_cache_entry_db_lock( bdb->bi_dbenv, locker,
-					*eip, 0, 0, lock );
+				/* If we had the entry already, this item
+				 * is on the LRU list.
+				 */
+				lru_del = 1;
+#ifdef BDB_HIER
+				rc = bdb_fix_dn( (*eip)->bei_e, 1 );
+				if ( rc ) {
+					bdb_cache_entry_db_relock( bdb->bi_dbenv,
+						locker, *eip, 1, 0, lock );
+					/* check again in case other modifier did it already */
+					if ( bdb_fix_dn( (*eip)->bei_e, 1 ) )
+						rc = bdb_fix_dn( (*eip)->bei_e, 2 );
+					bdb_cache_entry_db_relock( bdb->bi_dbenv,
+						locker, *eip, 0, 0, lock );
+				}
 #endif
+			}
 		}
 	}
-	if ( rc == 0 && (*eip)->bei_kids == NULL ) {
+	if ( rc == 0 ) {
 		/* set lru mutex */
 		ldap_pvt_thread_mutex_lock( &bdb->bi_cache.lru_mutex );
-		LRU_DELETE( &bdb->bi_cache, *eip );
-		LRU_ADD( &bdb->bi_cache, *eip );
-		ldap_pvt_thread_mutex_unlock( &bdb->bi_cache.lru_mutex );
+		/* if entry is old, remove from old spot on LRU list */
+		if ( lru_del ) {
+			LRU_DELETE( &bdb->bi_cache, *eip );
+		} else {
+		/* if entry is new, bump cache size */
+			bdb->bi_cache.c_cursize++;
+		}
+		/* lru_mutex is unlocked for us */
+		bdb_cache_lru_add( bdb, locker, *eip );
 	}
 
 	if ( islocked ) {
@@ -614,8 +711,7 @@ int
 bdb_cache_children(
 	Operation *op,
 	DB_TXN *txn,
-	Entry *e
-)
+	Entry *e )
 {
 	int rc;
 
@@ -627,7 +723,7 @@ bdb_cache_children(
 	}
 	rc = bdb_dn2id_children( op, txn, e );
 	if ( rc == DB_NOTFOUND ) {
-		BEI(e)->bei_state |= CACHE_ENTRY_NO_KIDS;
+		BEI(e)->bei_state |= CACHE_ENTRY_NO_KIDS | CACHE_ENTRY_NO_GRANDKIDS;
 	}
 	return rc;
 }
@@ -639,8 +735,7 @@ bdb_cache_add(
 	EntryInfo *eip,
 	Entry *e,
 	struct berval *nrdn,
-	u_int32_t locker
-)
+	u_int32_t locker )
 {
 	EntryInfo *new, ei;
 	struct berval rdn = e->e_name;
@@ -655,12 +750,26 @@ bdb_cache_add(
 		rdn.bv_len = ptr - rdn.bv_val;
 	}
 	ber_dupbv( &ei.bei_rdn, &rdn );
+	if ( eip->bei_dkids ) eip->bei_dkids++;
 #endif
-	rc = bdb_entryinfo_add_internal( bdb, &ei, &new, locker );
+
+	rc = bdb_entryinfo_add_internal( bdb, &ei, &new );
+	/* bdb_csn_commit can cause this when adding the database root entry */
+	if ( new->bei_e ) bdb_entry_return( new->bei_e );
 	new->bei_e = e;
 	e->e_private = new;
-	new->bei_state = CACHE_ENTRY_NO_KIDS;
+	new->bei_state = CACHE_ENTRY_NO_KIDS | CACHE_ENTRY_NO_GRANDKIDS;
 	eip->bei_state &= ~CACHE_ENTRY_NO_KIDS;
+	if (eip->bei_parent) {
+		eip->bei_parent->bei_state &= ~CACHE_ENTRY_NO_GRANDKIDS;
+	}
+
+	/* set lru mutex */
+	ldap_pvt_thread_mutex_lock( &bdb->bi_cache.lru_mutex );
+	++bdb->bi_cache.c_cursize;
+	/* lru_mutex is unlocked for us */
+	bdb_cache_lru_add( bdb, locker, new );
+
 	bdb_cache_entryinfo_unlock( eip );
 	ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
 	return rc;
@@ -672,8 +781,7 @@ bdb_cache_modify(
 	Attribute *newAttrs,
 	DB_ENV *env,
 	u_int32_t locker,
-	DB_LOCK *lock
-)
+	DB_LOCK *lock )
 {
 	EntryInfo *ei = BEI(e);
 	
@@ -702,8 +810,7 @@ bdb_cache_modrdn(
 	EntryInfo *ein,
 	DB_ENV *env,
 	u_int32_t locker,
-	DB_LOCK *lock
-)
+	DB_LOCK *lock )
 {
 	EntryInfo *ei = BEI(e), *pei;
 	struct berval rdn;
@@ -719,15 +826,12 @@ bdb_cache_modrdn(
 		attrs_free( e->e_attrs );
 	}
 	e->e_attrs = new->e_attrs;
-#ifdef BDB_HIER
-	ch_free(e->e_name.bv_val);
-#else
-	if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val >
-		e->e_bv.bv_val + e->e_bv.bv_len ) {
+	if( e->e_nname.bv_val < e->e_bv.bv_val ||
+		e->e_nname.bv_val > e->e_bv.bv_val + e->e_bv.bv_len )
+	{
 		ch_free(e->e_name.bv_val);
 		ch_free(e->e_nname.bv_val);
 	}
-#endif
 	e->e_name = new->e_name;
 	e->e_nname = new->e_nname;
 
@@ -756,11 +860,11 @@ bdb_cache_modrdn(
 		bdb_cache_entryinfo_lock( ein );
 	}
 #ifdef BDB_HIER
-	{ int max = ei->bei_modrdns;
-	/* Record the generation number of this change */
+	{
+		int max = ei->bei_modrdns;
+		/* Record the generation number of this change */
 		for ( pei = ein; pei->bei_parent; pei = pei->bei_parent ) {
-			if ( pei->bei_modrdns > max )
-				max = pei->bei_modrdns;
+			if ( pei->bei_modrdns > max ) max = pei->bei_modrdns;
 		}
 		ei->bei_modrdns = max + 1;
 	}
@@ -782,8 +886,7 @@ bdb_cache_delete(
     Entry		*e,
     DB_ENV	*env,
     u_int32_t	locker,
-    DB_LOCK	*lock
-)
+    DB_LOCK	*lock )
 {
 	EntryInfo *ei = BEI(e);
 	int	rc;
@@ -793,6 +896,9 @@ bdb_cache_delete(
 	/* Set this early, warn off any queriers */
 	ei->bei_state |= CACHE_ENTRY_DELETED;
 
+	/* Lock the entry's info */
+	bdb_cache_entryinfo_lock( ei );
+
 	/* Get write lock on the data */
 	bdb_cache_entry_db_relock( env, locker, ei, 1, 0, lock );
 
@@ -819,42 +925,63 @@ bdb_cache_delete(
 	/* free cache write lock */
 	ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 	bdb_cache_entryinfo_unlock( ei->bei_parent );
+
+	/* Leave entry info locked */
+
 	return( rc );
 }
 
 void
 bdb_cache_delete_cleanup(
-	Entry *e
-)
+	Cache *cache,
+	Entry *e )
 {
-	bdb_cache_entryinfo_destroy( e->e_private );
+	EntryInfo *ei = BEI(e);
+
+	ei->bei_e = NULL;
 	e->e_private = NULL;
 	bdb_entry_return( e );
+
+	free( ei->bei_nrdn.bv_val );
+	ei->bei_nrdn.bv_val = NULL;
+#ifdef BDB_HIER
+	free( ei->bei_rdn.bv_val );
+	ei->bei_rdn.bv_val = NULL;
+	ei->bei_modrdns = 0;
+	ei->bei_ckids = 0;
+	ei->bei_dkids = 0;
+#endif
+	ei->bei_parent = NULL;
+	ei->bei_kids = NULL;
+	ei->bei_lruprev = NULL;
+
+	ldap_pvt_thread_rdwr_wlock( &cache->c_rwlock );
+	ei->bei_lrunext = cache->c_eifree;
+	cache->c_eifree = ei;
+	ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+	bdb_cache_entryinfo_unlock( ei );
 }
-	
+
 static int
 bdb_cache_delete_internal(
     Cache	*cache,
-    EntryInfo		*e
-)
+    EntryInfo		*e )
 {
 	int rc = 0;	/* return code */
 
+#ifdef BDB_HIER
+	e->bei_parent->bei_ckids--;
+	if ( e->bei_parent->bei_dkids ) e->bei_parent->bei_dkids--;
+#endif
 	/* dn tree */
-	if ( avl_delete( &e->bei_parent->bei_kids, (caddr_t) e, bdb_rdn_cmp ) == NULL )
+	if ( avl_delete( &e->bei_parent->bei_kids, (caddr_t) e, bdb_rdn_cmp )
+		== NULL )
 	{
 		rc = -1;
 	}
 
-	/* If parent has no more kids, put in on LRU list */
-	if ( e->bei_parent->bei_kids == NULL ) {
-		LRU_ADD( cache, e->bei_parent );
-		cache->c_cursize++;
-	}
-
 	/* id tree */
-	if ( avl_delete( &cache->c_idtree, (caddr_t) e, bdb_id_cmp ) == NULL )
-	{
+	if ( avl_delete( &cache->c_idtree, (caddr_t) e, bdb_id_cmp ) == NULL ) {
 		rc = -1;
 	}
 
@@ -940,7 +1067,6 @@ bdb_locker_id_free( void *key, void *data )
 	int lockid = (int) data;
 	int rc;
 
-
 	rc = XLOCK_ID_FREE( env, lockid );
 	if ( rc == EINVAL ) {
 		DB_LOCKREQ lr;
@@ -1013,3 +1139,25 @@ bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
 	return 0;
 }
 #endif
+
+void
+bdb_cache_delete_entry(
+	struct bdb_info *bdb,
+	EntryInfo *ei,
+	u_int32_t locker,
+	DB_LOCK *lock )
+{
+	ldap_pvt_thread_rdwr_wlock( &bdb->bi_cache.c_rwlock );
+	if ( bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, ei, 1, 1, lock ) == 0 )
+	{
+		if ( ei->bei_e && !(ei->bei_state & CACHE_ENTRY_NOT_LINKED )) {
+			LRU_DELETE( &bdb->bi_cache, ei );
+			ei->bei_e->e_private = NULL;
+			bdb_entry_return( ei->bei_e );
+			ei->bei_e = NULL;
+			--bdb->bi_cache.c_cursize;
+		}
+		bdb_cache_entry_db_unlock( bdb->bi_dbenv, lock );
+	}
+	ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
+}