Fix ITS#3255, boi_bdb comparisons

[openldap] / servers / slapd / back-bdb / init.c

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index cd9d9a7c26ccd464fd44960fecb42320065b2535..e9f616c602f76059a5717aa1521d4d21fbed77ed 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -36,7 +36,7 @@ static const struct bdbi_database {
        { NULL, NULL, 0, 0 }
 };
 
-struct berval bdb_uuid = { 0, NULL };
+struct berval bdb_uuid = BER_BVNULL;
 
 typedef void * db_malloc(size_t);
 typedef void * db_realloc(void *, size_t);
@@ -71,8 +71,8 @@ bdb_db_init( BackendDB *be )
        LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
-               "bdb_db_init: Initializing BDB database\n",
-               0, 0, 0 );
+               "bdb_db_init: Initializing %s database\n",
+               be->bd_info->bi_type, 0, 0 );
 #endif
 
        /* allocate backend-database-specific stuff */
@@ -196,14 +196,15 @@ bdb_db_open( BackendDB *be )
        bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
        bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
 
-#ifdef SLAP_IDL_CACHE
+       /* One long-lived TXN per thread, two TXNs per write op */
+       bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
+
        if ( bdb->bi_idl_cache_max_size ) {
                bdb->bi_idl_tree = NULL;
                ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
                ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
                bdb->bi_idl_cache_size = 0;
        }
-#endif
 
 #ifdef BDB_SUBDIRS
        {
@@ -447,6 +448,8 @@ bdb_db_open( BackendDB *be )
                return rc;
        }
 
+       XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
+
        /* <insert> open (and create) index databases */
        return 0;
 }
@@ -457,9 +460,7 @@ bdb_db_close( BackendDB *be )
        int rc;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        struct bdb_db_info *db;
-#ifdef SLAP_IDL_CACHE
        bdb_idl_cache_entry_t *entry, *next_entry;
-#endif
 
        while( bdb->bi_ndatabases-- ) {
                db = bdb->bi_databases[bdb->bi_ndatabases];
@@ -474,7 +475,6 @@ bdb_db_close( BackendDB *be )
 
        bdb_cache_release_all (&bdb->bi_cache);
 
-#ifdef SLAP_IDL_CACHE
        if ( bdb->bi_idl_cache_max_size ) {
                ldap_pvt_thread_rdwr_wlock ( &bdb->bi_idl_tree_rwlock );
                avl_free( bdb->bi_idl_tree, NULL );
@@ -489,7 +489,8 @@ bdb_db_close( BackendDB *be )
                }
                ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
        }
-#endif
+
+       XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
 
        return 0;
 }
@@ -540,12 +541,10 @@ bdb_db_destroy( BackendDB *be )
        ldap_pvt_thread_rdwr_destroy ( &bdb->bi_pslist_rwlock );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
-#ifdef SLAP_IDL_CACHE
        if ( bdb->bi_idl_cache_max_size ) {
                ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
                ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
        }
-#endif
 
        ch_free( bdb );
        be->be_private = NULL;
@@ -553,8 +552,8 @@ bdb_db_destroy( BackendDB *be )
        return 0;
 }
 
-#if    (defined(SLAPD_BDB_DYNAMIC) && !defined(BDB_HIER)) || \
-       (defined(SLAPD_HDB_DYNAMIC) && defined(BDB_HIER))
+#if    (SLAPD_BDB == SLAPD_MOD_DYNAMIC && !defined(BDB_HIER)) || \
+       (SLAPD_HDB == SLAPD_MOD_DYNAMIC && defined(BDB_HIER))
 int init_module( int argc, char *argv[] ) {
        BackendInfo bi;
 
@@ -569,7 +568,7 @@ int init_module( int argc, char *argv[] ) {
        backend_add( &bi );
        return 0;
 }
-#endif /* SLAPD_BDB_DYNAMIC */
+#endif /* SLAPD_BDB */
 
 int
 bdb_initialize(