]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/cache.c
Never let ldif_parse_line() return a NULL value with success.
[openldap] / servers / slapd / back-bdb / cache.c
index 5038db4bc799bacf7dbe6f7982e621f379a1a0db..ab0cec701cae25978bcb42362e81f40579b4940f 100644 (file)
@@ -45,13 +45,14 @@ static int  bdb_cache_delete_entry_internal(Cache *cache, Entry *e);
 static void    bdb_lru_print(Cache *cache);
 #endif
 
+#if 0  /* unused */
 static int
 bdb_cache_entry_rdwr_lock(Entry *e, int rw)
 {
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_entry_rdwr_lock: %s lock on ID %ld\n",
-                  rw ? "w" : "r", e->e_id ));
+       LDAP_LOG( CACHE, ENTRY, 
+               "bdb_cache_entry_rdwr_lock: %s lock on ID %ld\n",
+               rw ? "w" : "r", e->e_id, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n",
                rw ? "w" : "r", e->e_id, 0);
@@ -67,9 +68,9 @@ static int
 bdb_cache_entry_rdwr_trylock(Entry *e, int rw)
 {
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_entry_rdwr_trylock: try %s lock on ID: %ld.\n",
-                  rw ? "w" : "r", e->e_id ));
+       LDAP_LOG( CACHE, ENTRY, 
+               "bdb_cache_entry_rdwr_trylock: try %s lock on ID: %ld.\n",
+               rw ? "w" : "r", e->e_id, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%strylock: ID: %ld\n",
                rw ? "w" : "r", e->e_id, 0);
@@ -85,9 +86,9 @@ static int
 bdb_cache_entry_rdwr_unlock(Entry *e, int rw)
 {
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_entry_rdwr_unlock: remove %s lock on ID %ld.\n",
-                  rw ? "w" : "r", e->e_id ));
+       LDAP_LOG( CACHE, ENTRY, 
+               "bdb_cache_entry_rdwr_unlock: remove %s lock on ID %ld.\n",
+               rw ? "w" : "r", e->e_id, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n",
                rw ? "w" : "r", e->e_id, 0);
@@ -98,6 +99,7 @@ bdb_cache_entry_rdwr_unlock(Entry *e, int rw)
        else
                return ldap_pvt_thread_rdwr_runlock(&BEI(e)->bei_rdwr);
 }
+#endif /* unused */
 
 static int
 bdb_cache_entry_rdwr_init(Entry *e)
@@ -132,6 +134,55 @@ bdb_cache_entry_private_init( Entry *e )
        return 0;
 }
 
+int
+bdb_cache_entry_db_lock
+( DB_ENV *env, u_int32_t locker, Entry *e, int rw, u_int32_t flags, DB_LOCK *lock )
+{
+#ifdef NO_THREADS
+       return 0;
+#else
+       int       rc;
+       DBT       lockobj;
+       int       db_rw;
+
+       if (rw)
+               db_rw = DB_LOCK_WRITE;
+       else
+               db_rw = DB_LOCK_READ;
+
+       lockobj.data = e->e_nname.bv_val;
+       lockobj.size = e->e_nname.bv_len;
+       rc = LOCK_GET(env, locker, flags | DB_LOCK_NOWAIT,
+                                       &lockobj, db_rw, lock);
+       if (rc) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_entry_db_lock: entry %s, rw %d, rc %d\n",
+                       e->e_nname.bv_val, rw, rc );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "bdb_cache_entry_db_lock: entry %s, rw %d, rc %d\n",
+                       e->e_nname.bv_val, rw, rc );
+#endif
+       }
+       return rc;
+#endif /* NO_THREADS */
+}
+
+int
+bdb_cache_entry_db_unlock
+( DB_ENV *env, DB_LOCK *lock )
+{
+#ifdef NO_THREADS
+       return 0;
+#else
+       int rc;
+
+       rc = LOCK_PUT ( env, lock );
+       return rc;
+#endif
+}
+
 /*
  * marks an entry in CREATING state as committed, so it is really returned
  * to the cache. Otherwise an entry in CREATING state is removed.
@@ -162,8 +213,9 @@ bdb_cache_entry_private_destroy( Entry *e )
 }
 
 void
-bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
+bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
 {
+
        ID id;
        int refcnt, freeit = 1;
 
@@ -172,7 +224,9 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
 
        assert( e->e_private );
 
+#if 0
        bdb_cache_entry_rdwr_unlock(e, rw);
+#endif
 
        id = e->e_id;
        refcnt = --BEI(e)->bei_refcnt;
@@ -199,9 +253,112 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( CACHE, DETAIL1, 
+                          "bdb_unlocked_cache_return_entry_rw: return (%ld):%s, refcnt=%d\n",
+                          id, rw ? "w" : "r", refcnt );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "====> bdb_unlocked_cache_return_entry_%s( %ld ): created (%d)\n",
+                       rw ? "w" : "r", id, refcnt );
+#endif
+
+
+       } else if ( BEI(e)->bei_state == CACHE_ENTRY_DELETED ) {
+               if( refcnt > 0 ) {
+                       /* free cache write lock */
+                       ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CACHE, DETAIL1, 
+                                  "bdb_unlocked_cache_return_entry_rw: %ld, delete pending (%d).\n",
+                                  id, refcnt, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "====> bdb_unlocked_cache_return_entry_%s( %ld ): delete pending (%d)\n",
+                               rw ? "w" : "r", id, refcnt );
+#endif
+
+               } else {
+                       bdb_cache_entry_private_destroy( e );
+                       if ( freeit ) {
+                               bdb_entry_return( e );
+                       }
+
+                       /* free cache write lock */
+                       ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CACHE, DETAIL1, 
+                                  "bdb_unlocked_cache_return_entry_rw: (%ld): deleted (%d)\n",
+                                  id, refcnt, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "====> bdb_unlocked_cache_return_entry_%s( %ld ): deleted (%d)\n",
+                               rw ? "w" : "r", id, refcnt );
+#endif
+               }
+
+       } else {
+               /* free cache write lock */
+               ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( CACHE, DETAIL1, 
+                          "bdb_unlocked_cache_return_entry_rw: ID %ld:%s returned (%d)\n",
+                          id, rw ? "w": "r", refcnt );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "====> bdb_unlocked_cache_return_entry_%s( %ld ): returned (%d)\n",
+                       rw ? "w" : "r", id, refcnt);
+#endif
+       }
+}
+
+void
+bdb_cache_return_entry_rw
+( DB_ENV *env, Cache *cache, Entry *e, int rw, DB_LOCK *lock )
+{
+       ID id;
+       int refcnt, freeit = 1;
+
+       /* set cache write lock */
+       ldap_pvt_thread_rdwr_wlock( &cache->c_rwlock );
+
+       assert( e->e_private );
+
+       bdb_cache_entry_db_unlock( env, lock );
+#if 0
+       bdb_cache_entry_rdwr_unlock(e, rw);
+#endif
+
+       id = e->e_id;
+       refcnt = --BEI(e)->bei_refcnt;
+
+       /*
+        * if the entry is returned when in CREATING state, it is deleted
+        * but not freed because it may belong to someone else (do_add,
+        * for instance)
+        */
+       if (  BEI(e)->bei_state == CACHE_ENTRY_CREATING ) {
+               /* set lru mutex */
+               ldap_pvt_thread_mutex_lock( &cache->lru_mutex );
+               bdb_cache_delete_entry_internal( cache, e );
+               /* free lru mutex */
+               ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
+               freeit = 0;
+               /* now the entry is in DELETED state */
+       }
+
+       if ( BEI(e)->bei_state == CACHE_ENTRY_COMMITTED ) {
+               BEI(e)->bei_state = CACHE_ENTRY_READY;
+
+               /* free cache write lock */
+               ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( CACHE, DETAIL1, 
                           "bdb_cache_return_entry_rw: return (%ld):%s, refcnt=%d\n",
-                          id, rw ? "w" : "r", refcnt ));
+                          id, rw ? "w" : "r", refcnt );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "====> bdb_cache_return_entry_%s( %ld ): created (%d)\n",
@@ -215,9 +372,9 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                        ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
+                       LDAP_LOG( CACHE, DETAIL1, 
                                   "bdb_cache_return_entry_rw: %ld, delete pending (%d).\n",
-                                  id, refcnt ));
+                                  id, refcnt, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "====> bdb_cache_return_entry_%s( %ld ): delete pending (%d)\n",
@@ -234,9 +391,9 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                        ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
+                       LDAP_LOG( CACHE, DETAIL1, 
                                   "bdb_cache_return_entry_rw: (%ld): deleted (%d)\n",
-                                  id, refcnt ));
+                                  id, refcnt, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "====> bdb_cache_return_entry_%s( %ld ): deleted (%d)\n",
@@ -249,9 +406,9 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( CACHE, DETAIL1, 
                           "bdb_cache_return_entry_rw: ID %ld:%s returned (%d)\n",
-                          id, rw ? "w": "r", refcnt ));
+                          id, rw ? "w": "r", refcnt );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "====> bdb_cache_return_entry_%s( %ld ): returned (%d)\n",
@@ -290,21 +447,25 @@ bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw )
  * returns:    0       entry has been created and locked
  *             1       entry already existed
  *             -1      something bad happened
+ *             other    Berkeley DB locking error code
  */
 int
 bdb_cache_add_entry_rw(
+    DB_ENV     *env,
     Cache      *cache,
     Entry      *e,
-    int                rw
+    int                rw,
+    u_int32_t  locker,
+    DB_LOCK    *lock
 )
 {
        int     i, rc;
        Entry   *ee;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_add_entry_rw: add (%s):%s to cache\n",
-                  e->e_dn, rw ? "w" : "r" ));
+       LDAP_LOG( CACHE, ENTRY, 
+               "bdb_cache_add_entry_rw: add (%s):%s to cache\n",
+               e->e_dn, rw ? "w" : "r", 0 );
 #endif
        /* set cache write lock */
        ldap_pvt_thread_rdwr_wlock( &cache->c_rwlock );
@@ -316,9 +477,9 @@ bdb_cache_add_entry_rw(
                ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
-                          "bdb_cache_add_entry_rw: add (%s):%ld private init failed!\n",
-                          e->e_dn, e->e_id ));
+               LDAP_LOG( CACHE, ERR, 
+                       "bdb_cache_add_entry_rw: add (%s):%ld private init failed!\n",
+                       e->e_dn, e->e_id, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "====> bdb_cache_add_entry( %ld ): \"%s\": private init failed!\n",
@@ -336,9 +497,9 @@ bdb_cache_add_entry_rw(
                ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_add_entry: (%s):%ld already in cache.\n",
-                          e->e_dn, e->e_id ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_add_entry: (%s):%ld already in cache.\n",
+                       e->e_dn, e->e_id, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "====> bdb_cache_add_entry( %ld ): \"%s\": already in dn cache\n",
@@ -355,9 +516,9 @@ bdb_cache_add_entry_rw(
                (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_add_entry: (%s):%ls already in cache.\n",
-                          e->e_dn, e->e_id ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_add_entry: (%s):%ls already in cache.\n",
+                       e->e_dn, e->e_id, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "====> bdb_cache_add_entry( %ld ): \"%s\": already in id cache\n",
@@ -369,9 +530,9 @@ bdb_cache_add_entry_rw(
                        (AVL_CMP) entry_dn_cmp ) == NULL )
                {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                                  "bdb_cache_add_entry: can't delete (%s) from cache.\n",
-                                  e->e_dn ));
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_add_entry: can't delete (%s) from cache.\n", 
+                               e->e_dn, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
                            0, 0, 0 );
@@ -385,7 +546,39 @@ bdb_cache_add_entry_rw(
                return( -1 );
        }
 
-       bdb_cache_entry_rdwr_lock( e, rw );
+       rc = bdb_cache_entry_db_lock( env, locker, e, rw, 0, lock );
+       switch ( rc ) {
+       case 0 :
+               break;
+       case DB_LOCK_DEADLOCK :
+       case DB_LOCK_NOTGRANTED :
+               /* undo avl changes immediately */
+               if ( avl_delete( &cache->c_idtree, (caddr_t) e,
+                       (AVL_CMP) entry_id_cmp ) == NULL ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_add_entry: can't delete (%s) from cache.\n", 
+                               e->e_dn, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY, "====> can't delete from id cache\n", 0, 0, 0 );
+#endif
+               }
+               if ( avl_delete( &cache->c_dntree, (caddr_t) e,
+                               (AVL_CMP) entry_dn_cmp ) == NULL ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_add_entry: can't delete (%s) from cache.\n", 
+                               e->e_dn, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n", 0, 0, 0 );
+#endif
+               }
+               /* fall through */
+       default :
+               bdb_cache_entry_private_destroy(e);
+               ldap_pvt_thread_rdwr_wunlock( &cache->c_rwlock );
+               return rc;
+       }
 
        /* put the entry into 'CREATING' state */
        /* will be marked after when entry is returned */
@@ -463,9 +656,9 @@ bdb_cache_update_entry(
                (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_update_entry: (%s):%ld already in dn cache\n",
-                          e->e_dn, e->e_id ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_update_entry: (%s):%ld already in dn cache\n",
+                       e->e_dn, e->e_id, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "====> bdb_cache_update_entry( %ld ): \"%s\": already in dn cache\n",
@@ -482,9 +675,9 @@ bdb_cache_update_entry(
                (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_update_entry: (%s)%ld already in id cache\n",
-                          e->e_dn, e->e_id ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_update_entry: (%s)%ld already in id cache\n",
+                       e->e_dn, e->e_id, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "====> bdb_cache_update_entry( %ld ): \"%s\": already in id cache\n",
@@ -496,9 +689,9 @@ bdb_cache_update_entry(
                        (AVL_CMP) entry_dn_cmp ) == NULL )
                {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                                  "bdb_cache_update_entry: can't delete (%s)%ld from dn cache.\n",
-                                  e->e_dn, e->e_id ));
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_update_entry: can't delete (%s)%ld from dn cache.\n",
+                               e->e_dn, e->e_id, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
                            0, 0, 0 );
@@ -608,9 +801,9 @@ try_again:
                        ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                                  "bdb_cache_find_entry_dn2id: (%s) %ld not ready: %d\n",
-                                  ndn->bv_val, id, state ));
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_find_entry_dn2id: (%s) %ld not ready: %d\n",
+                               ndn->bv_val, id, state );
 #else
                        Debug(LDAP_DEBUG_TRACE,
                                "====> bdb_cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
@@ -636,9 +829,9 @@ try_again:
                ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_find_entry_dn2id: (%s): %ld %d tries\n",
-                          ndn->bv_val, id, count ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_find_entry_dn2id: (%s): %ld %d tries\n",
+                       ndn->bv_val, id, count );
 #else
                Debug(LDAP_DEBUG_TRACE,
                        "====> bdb_cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
@@ -661,14 +854,18 @@ try_again:
 
 Entry *
 bdb_cache_find_entry_id(
+       DB_ENV  *env,
        Cache   *cache,
        ID                              id,
-       int                             rw
+       int                             rw,
+       u_int32_t       locker,
+       DB_LOCK         *lock
 )
 {
        Entry   e;
        Entry   *ep;
        int     count = 0;
+       int     rc;
 
        e.e_id = id;
 
@@ -700,9 +897,9 @@ try_again:
                        ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                                  "bdb_cache_find_entry_id: (%ld)->%ld not ready (%d).\n",
-                                  id, ep_id, state ));
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_find_entry_id: (%ld)->%ld not ready (%d).\n",
+                               id, ep_id, state );
                                   
 #else
                        Debug(LDAP_DEBUG_TRACE,
@@ -715,7 +912,13 @@ try_again:
                }
 
                /* acquire reader lock */
+               rc = bdb_cache_entry_db_lock ( env, locker, ep, rw, 0, lock );
+
+#if 0
                if ( bdb_cache_entry_rdwr_trylock(ep, rw) == LDAP_PVT_THREAD_EBUSY ) {
+#endif
+
+               if ( rc ) { /* will be changed to retry beyond threshold */
                        /* could not acquire entry lock...
                         * owner cannot free as we have the cache locked.
                         * so, unlock the cache, yield, and try again.
@@ -725,13 +928,16 @@ try_again:
                        ldap_pvt_thread_rdwr_runlock( &cache->c_rwlock );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                                  "bdb_cache_find_entry_id: %ld -> %ld (busy) %d.\n",
-                                  id, ep_id, state ));
+                       LDAP_LOG( CACHE, INFO, 
+                               "bdb_cache_find_entry_id: %ld -> %ld (busy) %d.\n",
+                               id, ep_id, state );
 #else
                        Debug(LDAP_DEBUG_TRACE,
                                "====> bdb_cache_find_entry_id( %ld ): %ld (busy) %d\n",
                                id, ep_id, state);
+                       Debug(LDAP_DEBUG_TRACE,
+                               "locker = %d\n",
+                               locker, 0, 0);
 #endif
 
                        ldap_pvt_thread_yield();
@@ -752,9 +958,9 @@ try_again:
                ldap_pvt_thread_mutex_unlock( &cache->lru_mutex );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1,
-                          "bdb_cache_find_entry_id: %ld -> %s  found %d tries.\n",
-                          ep_id, ep->e_dn, count ));
+               LDAP_LOG( CACHE, DETAIL1, 
+                       "bdb_cache_find_entry_id: %ld -> %s  found %d tries.\n",
+                       ep_id, ep->e_dn, count );
 #else
                Debug(LDAP_DEBUG_TRACE,
                        "====> bdb_cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n",
@@ -796,8 +1002,8 @@ bdb_cache_delete_entry(
        assert( e->e_private );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_delete_entry: delete %ld.\n", e->e_id ));
+       LDAP_LOG( CACHE, ENTRY, 
+               "bdb_cache_delete_entry: delete %ld.\n", e->e_id, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_delete_entry( %ld )\n",
                e->e_id, 0, 0 );
@@ -864,8 +1070,7 @@ bdb_cache_release_all( Cache *cache )
        ldap_pvt_thread_mutex_lock( &cache->lru_mutex );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "bdb_cache_release_all: enter\n" ));
+       LDAP_LOG( CACHE, ENTRY, "bdb_cache_release_all: enter\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_release_all\n", 0, 0, 0 );
 #endif
@@ -884,8 +1089,8 @@ bdb_cache_release_all( Cache *cache )
 
        if ( cache->c_cursize ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
-                          "bdb_cache_release_all: Entry cache could not be emptied.\n" ));
+               LDAP_LOG( CACHE, INFO,
+                  "bdb_cache_release_all: Entry cache could not be emptied.\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 );
 #endif
@@ -916,3 +1121,57 @@ bdb_lru_print( Cache *cache )
        }
 }
 #endif
+
+#ifdef BDB_REUSE_LOCKERS
+void
+bdb_locker_id_free( void *key, void *data )
+{
+       DB_ENV *env = key;
+       int lockid = (int) data;
+
+       XLOCK_ID_FREE( env, lockid );
+}
+
+int
+bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
+{
+       int i, rc, lockid;
+       void *data;
+
+       if ( !env || !op || !locker ) return -1;
+
+       /* Shouldn't happen unless we're single-threaded */
+       if ( !op->o_threadctx ) {
+               *locker = 0;
+               return 0;
+       }
+
+       if ( ldap_pvt_thread_pool_getkey( op->o_threadctx, env, &data, NULL ) ) {
+               for ( i=0, rc=1; rc != 0 && i<4; i++ ) {
+                       rc = XLOCK_ID( env, &lockid );
+                       if (rc) ldap_pvt_thread_yield();
+               }
+               if ( rc != 0) {
+                       return rc;
+               }
+               data = (void *)lockid;
+               if ( ( rc = ldap_pvt_thread_pool_setkey( op->o_threadctx, env,
+                       data, bdb_locker_id_free ) ) ) {
+                       XLOCK_ID_FREE( env, lockid );
+#ifdef NEW_LOGGING
+                       LDAP_LOG( BACK_BDB, ERR, "bdb_locker_id: err %s(%d)\n",
+                               db_strerror(rc), rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY, "bdb_locker_id: err %s(%d)\n",
+                               db_strerror(rc), rc, 0 );
+#endif
+
+                       return rc;
+               }
+       } else {
+               lockid = (int)data;
+       }
+       *locker = lockid;
+       return 0;
+}
+#endif