Last changes should have been #ifdef

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index aa66fc0b853cd5517edaec8ed1d7c32723d230e7..f64e5a35708c21b00cc41eab656503a8541bc870 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -66,10 +66,33 @@ bdb_db_init( BackendDB *be )
        bdb->bi_dbenv_xflags = 0;
        bdb->bi_dbenv_mode = DEFAULT_MODE;
 
+#ifndef NO_THREADS
+       bdb->bi_lock_detect = DB_LOCK_NORUN;
+#endif
+
        be->be_private = bdb;
        return 0;
 }
 
+#ifndef NO_THREADS
+static void *lock_detect_task( void *arg )
+{
+       struct bdb_info *bdb = (struct bdb_info *) arg;
+
+       while( bdb->bi_dbenv != NULL ) {
+               int rc;
+               sleep( bdb->bi_lock_detect_seconds );
+
+               rc = lock_detect( bdb->bi_dbenv, DB_LOCK_CONFLICT, bdb->bi_lock_detect, NULL );
+               if( rc != 0 ) {
+                       break;
+               }
+       }
+
+       return NULL;
+}
+#endif
+
 static int
 bdb_db_open( BackendDB *be )
 {
@@ -91,14 +114,8 @@ bdb_db_open( BackendDB *be )
                return rc;
        }
 
-       flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN |
-               DB_CREATE | DB_RECOVER | DB_THREAD;
-
-#ifdef SLAPD_BDB_PRIVATE
-       flags |= DB_PRIVATE;
-#else
-       flags |= DB_INIT_MPOOL;
-#endif
+       flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | 
+               DB_THREAD | DB_CREATE | DB_RECOVER;
 
        bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0] );
        bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
@@ -124,7 +141,7 @@ bdb_db_open( BackendDB *be )
                rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "bi_back_db_open: set_lg_dir(%s) failed: %s (%d)\n",
+                               "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
                                dir, db_strerror(rc), rc );
                        return rc;
                }
@@ -142,7 +159,7 @@ bdb_db_open( BackendDB *be )
 #endif
 
        Debug( LDAP_DEBUG_TRACE,
-               "bi_back_db_open: dbenv_open(%s)\n",
+               "bdb_db_open: dbenv_open(%s)\n",
                bdb->bi_dbenv_home, 0, 0);
 
        rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
@@ -158,6 +175,9 @@ bdb_db_open( BackendDB *be )
 
        flags = DB_THREAD | DB_CREATE;
 
+       bdb->bi_databases = (struct bdb_db_info **) ch_malloc(
+               BDB_INDICES * sizeof(struct bdb_db_info *) );
+
        /* open (and create) main database */
        for( i = 0; i < BDB_INDICES; i++ ) {
                struct bdb_db_info *db;
@@ -185,11 +205,30 @@ bdb_db_open( BackendDB *be )
                                bdb->bi_dbenv_home, db_strerror(rc), rc );
                        return rc;
                }
+
+               bdb->bi_databases[i] = db;
        }
 
+       /* get nextid */
+       rc = bdb_last_id( be, NULL );
+       if( rc != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: last_id(%s) failed: %s (%d)\n",
+                       bdb->bi_dbenv_home, db_strerror(rc), rc );
+               return rc;
+       }
+
+
        /* <insert> open (and create) index databases */
 
 
+#ifndef NO_THREADS
+       if( bdb->bi_lock_detect != DB_LOCK_NORUN ) {
+               /* listener as a separate THREAD */
+               rc = ldap_pvt_thread_create( &bdb->bi_lock_detect_tid,
+                       1, lock_detect_task, bdb );
+       }
+#endif
        return 0;
 }
 
@@ -223,13 +262,15 @@ bdb_db_destroy( BackendDB *be )
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 
        /* close db environment */
-       rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
-       bdb->bi_dbenv = NULL;
-       if( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "bdb_db_destroy: close failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
-               return rc;
+       if( bdb->bi_dbenv ) {
+               rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+               bdb->bi_dbenv = NULL;
+               if( rc != 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "bdb_db_destroy: close failed: %s (%d)\n",
+                               db_strerror(rc), rc, 0 );
+                       return rc;
+               }
        }
 
        return 0;
@@ -237,20 +278,20 @@ bdb_db_destroy( BackendDB *be )
 
 #ifdef SLAPD_BDB_DYNAMIC
 int back_bdb_LTX_init_module( int argc, char *argv[] ) {
-    BackendInfo bi;
+       BackendInfo bi;
 
-    memset( &bi, '\0', sizeof(bi) );
-    bi.bi_type = "bdb";
-    bi.bi_init = bdb_initialize;
+       memset( &bi, '\0', sizeof(bi) );
+       bi.bi_type = "bdb";
+       bi.bi_init = bdb_initialize;
 
-    backend_add( &bi );
-    return 0;
+       backend_add( &bi );
+       return 0;
 }
 #endif /* SLAPD_BDB_DYNAMIC */
 
 int
 bdb_initialize(
-    BackendInfo        *bi
+       BackendInfo     *bi
 )
 {
        static char *controls[] = {
@@ -300,20 +341,20 @@ bdb_initialize(
        bi->bi_op_bind = bdb_bind;
        bi->bi_op_compare = bdb_compare;
        bi->bi_op_delete = bdb_delete;
+       bi->bi_op_modify = bdb_modify;
+       bi->bi_op_modrdn = bdb_modrdn;
        bi->bi_op_search = bdb_search;
 
 #if 0
        bi->bi_op_unbind = bdb_unbind;
-       bi->bi_op_modify = bdb_modify;
-       bi->bi_op_modrdn = bdb_modrdn;
        bi->bi_op_abandon = bdb_abandon;
 
        bi->bi_extended = bdb_extended;
 
        bi->bi_acl_group = bdb_group;
        bi->bi_acl_attribute = bdb_attribute;
-       bi->bi_chk_referrals = bdb_referrals;
 #endif
+       bi->bi_chk_referrals = bdb_referrals;
 
        bi->bi_entry_release_rw = 0;