Added SLAP_TOOL_READMAIN and SLAP_TOOL_READONLY slapMode flags. The rw

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 48feeee95f300aa3b6b70424aa2651f172f27599..41ecef07a0837aa0110501f33f7588275543d922 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -16,18 +16,14 @@
 #include "external.h"
 #include <lutil.h>
 
-static struct bdbi_database {
+static const struct bdbi_database {
        char *file;
        char *name;
        int type;
        int flags;
 } bdbi_databases[] = {
        { "id2entry" BDB_SUFFIX, "id2entry", DB_BTREE, 0 },
-#ifdef BDB_HIER
-       { "id2parent" BDB_SUFFIX, "id2parent", DB_BTREE, 0 },
-#else
        { "dn2id" BDB_SUFFIX, "dn2id", DB_BTREE, 0 },
-#endif
        { NULL, NULL, 0, 0 }
 };
 
@@ -100,10 +96,8 @@ bdb_db_init( BackendDB *be )
 
        ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
        ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
+       ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_dntree.bei_kids_mutex );
        ldap_pvt_thread_rdwr_init ( &bdb->bi_cache.c_rwlock );
-#ifdef BDB_HIER
-       ldap_pvt_thread_rdwr_init( &bdb->bi_tree_rdwr );
-#endif
 
        be->be_private = bdb;
 
@@ -194,13 +188,20 @@ bdb_db_open( BackendDB *be )
        if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
 #endif
 
+       /* If a key was set, use shared memory for the BDB environment */
+       if ( bdb->bi_shm_key ) {
+               bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
+               flags |= DB_SYSTEM_MEM;
+       }
+
        bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
        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
        if ( bdb->bi_idl_cache_max_size ) {
-               ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_mutex );
+               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
@@ -332,7 +333,7 @@ bdb_db_open( BackendDB *be )
                }
        }
 
-       flags = DB_THREAD | DB_CREATE | bdb->bi_db_opflags;
+       flags = DB_THREAD | bdb->bi_db_opflags;
 
        bdb->bi_databases = (struct bdb_db_info **) ch_malloc(
                BDB_INDICES * sizeof(struct bdb_db_info *) );
@@ -362,15 +363,32 @@ bdb_db_open( BackendDB *be )
                                bdb_bt_compare );
                        rc = db->bdi_db->set_pagesize( db->bdi_db,
                                BDB_ID2ENTRY_PAGESIZE );
+                       if ( slapMode & SLAP_TOOL_READMAIN ) {
+                               flags |= DB_RDONLY;
+                       } else {
+                               flags |= DB_CREATE;
+                       }
                } else {
-#ifdef BDB_HIER
-                       rc = db->bdi_db->set_bt_compare( db->bdi_db,
-                               bdb_bt_compare );
-#else
                        rc = db->bdi_db->set_flags( db->bdi_db, 
                                DB_DUP | DB_DUPSORT );
+#ifndef BDB_HIER
                        rc = db->bdi_db->set_dup_compare( db->bdi_db,
                                bdb_bt_compare );
+                       if ( slapMode & SLAP_TOOL_READONLY ) {
+                               flags |= DB_RDONLY;
+                       } else {
+                               flags |= DB_CREATE;
+                       }
+#else
+                       rc = db->bdi_db->set_dup_compare( db->bdi_db,
+                               bdb_dup_compare );
+                       rc = db->bdi_db->set_bt_compare( db->bdi_db,
+                               bdb_bt_compare );
+                       if ( slapMode & (SLAP_TOOL_READONLY|SLAP_TOOL_READMAIN) ) {
+                               flags |= DB_RDONLY;
+                       } else {
+                               flags |= DB_CREATE;
+                       }
 #endif
                        rc = db->bdi_db->set_pagesize( db->bdi_db,
                                BDB_PAGESIZE );
@@ -407,6 +425,7 @@ bdb_db_open( BackendDB *be )
                        return rc;
                }
 
+               flags &= ~(DB_CREATE | DB_RDONLY);
                db->bdi_name = bdbi_databases[i].name;
                bdb->bi_databases[i] = db;
        }
@@ -430,9 +449,6 @@ bdb_db_open( BackendDB *be )
        }
 
        /* <insert> open (and create) index databases */
-#ifdef BDB_HIER
-       rc = bdb_build_tree( be );
-#endif
        return 0;
 }
 
@@ -460,17 +476,20 @@ bdb_db_close( BackendDB *be )
        bdb_cache_release_all (&bdb->bi_cache);
 
 #ifdef SLAP_IDL_CACHE
-       ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
-       entry = bdb->bi_idl_lru_head;
-       while ( entry != NULL ) {
-               next_entry = entry->idl_lru_next;
-               avl_delete( &bdb->bi_idl_tree, (caddr_t) entry, bdb_idl_entry_cmp );
-               free( entry->idl );
-               free( entry->kstr.bv_val );
-               free( entry );
-               entry = next_entry;
+       if ( bdb->bi_idl_cache_max_size ) {
+               ldap_pvt_thread_rdwr_wlock ( &bdb->bi_idl_tree_rwlock );
+               avl_free( bdb->bi_idl_tree, NULL );
+               entry = bdb->bi_idl_lru_head;
+               while ( entry != NULL ) {
+                       next_entry = entry->idl_lru_next;
+                       if ( entry->idl )
+                               free( entry->idl );
+                       free( entry->kstr.bv_val );
+                       free( entry );
+                       entry = next_entry;
+               }
+               ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
        }
-       ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
 #endif
 
        return 0;
@@ -498,8 +517,6 @@ bdb_db_destroy( BackendDB *be )
 #endif
                }
 
-               bdb_cache_release_all (&bdb->bi_cache);
-
                rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
                bdb->bi_dbenv = NULL;
                if( rc != 0 ) {
@@ -518,12 +535,16 @@ bdb_db_destroy( BackendDB *be )
 
        if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
 
-#ifdef BDB_HIER
-       ldap_pvt_thread_rdwr_destroy( &bdb->bi_tree_rdwr );
-#endif
        ldap_pvt_thread_rdwr_destroy ( &bdb->bi_cache.c_rwlock );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_mutex );
+       ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_dntree.bei_kids_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_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;