Fix typo

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index afc3e97ee62d24d404acfeccaf54445c2057ad24..aa956d2b1e31049f10393a310913e3af98829cef 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -91,12 +91,10 @@ bdb_db_init( BackendDB *be )
 
        bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE;
 
-#ifndef NO_THREADS
-#if 0
-       bdb->bi_lock_detect = DB_LOCK_NORUN;
-#else
        bdb->bi_lock_detect = DB_LOCK_DEFAULT;
-#endif
+
+#ifdef LDAP_CLIENT_UPDATE
+       LDAP_LIST_INIT (&bdb->psearch_list);
 #endif
 
        ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
@@ -111,37 +109,6 @@ bdb_db_init( BackendDB *be )
        return 0;
 }
 
-#if 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;
-               int aborted;
-               sleep( bdb->bi_lock_detect_seconds );
-
-               rc = LOCK_DETECT( bdb->bi_dbenv, 0,
-                       bdb->bi_lock_detect, &aborted );
-
-               if( rc != 0 ) {
-                       break;
-               }
-
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_BDB, ERR, "bdb_db_init: aborted %d locks\n", 
-                       aborted, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "bdb_lock_detect: aborted %d locks\n",
-                       aborted, 0, 0 );
-#endif
-       }
-
-       return NULL;
-}
-#endif
-
 int
 bdb_bt_compare(
        DB *db, 
@@ -186,10 +153,6 @@ bdb_db_open( BackendDB *be )
                be->be_suffix[0].bv_val, 0, 0 );
 #endif
 
-       db_env_set_func_free( ber_memfree );
-       db_env_set_func_malloc( ber_memalloc );
-       db_env_set_func_realloc( ber_memrealloc );
-
        /* we should check existance of dbenv_home and db_directory */
 
        rc = db_env_create( &bdb->bi_dbenv, 0 );
@@ -219,9 +182,7 @@ bdb_db_open( BackendDB *be )
 
        bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
        bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
-#ifndef NO_THREADS
        bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
-#endif
 
 #ifdef BDB_SUBDIRS
        {
@@ -432,14 +393,6 @@ bdb_db_open( BackendDB *be )
 #ifdef BDB_HIER
        rc = bdb_build_tree( be );
 #endif
-
-#if 0 /* 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;
 }
 
@@ -607,13 +560,15 @@ bdb_initialize(
 #endif
        }
 
-#if 0
-       db_env_set_func_malloc( ch_malloc );
-       db_env_set_func_realloc( ch_realloc );
-       db_env_set_func_free( ch_free );
-#endif
-
+       db_env_set_func_free( ber_memfree );
+       db_env_set_func_malloc( (db_malloc *)ber_memalloc );
+       db_env_set_func_realloc( (db_realloc *)ber_memrealloc );
+#ifndef NO_THREAD
+       /* This is a no-op on a NO_THREAD build. Leave the default
+        * alone so that BDB will sleep on interprocess conflicts.
+        */
        db_env_set_func_yield( ldap_pvt_thread_yield );
+#endif
 
        {
                static char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
@@ -660,6 +615,9 @@ bdb_initialize(
 
        bi->bi_chk_referrals = bdb_referrals;
        bi->bi_operational = bdb_operational;
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+       bi->bi_has_subordinates = bdb_hasSubordinates;
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
        bi->bi_entry_release_rw = bdb_entry_release;
 
        /*