X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fconfig.c;h=bd74e95e8c32f39f3bb19f0b8faa22ab72cba048;hb=08059f1633bfd9d0a709761b026bdb8e4441c6e6;hp=37bc1c389bc6a3438e05dcb2906821d9698f5e16;hpb=323689da57e7202986ca46f1b14f7e7e2d2f640d;p=openldap

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 37bc1c389b..bd74e95e8c 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -1,7 +1,7 @@
 /* config.c - bdb backend configuration file routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,6 +12,10 @@
 
 #include "back-bdb.h"
 
+#ifdef DB_DIRTY_READ
+#	define	SLAP_BDB_ALLOW_DIRTY_READ
+#endif
+
 int
 bdb_db_config(
 	BackendDB	*be,
@@ -42,10 +46,10 @@ bdb_db_config(
 		}
 		bdb->bi_dbenv_home = ch_strdup( argv[1] );
 
-	/* turn off transactions, use CDB mode instead */
-	} else if ( strcasecmp( argv[0], "dbnotxn" ) == 0 ) {
-		bdb->bi_txn = 0;
-
+#ifdef SLAP_BDB_ALLOW_DIRTY_READ
+	} else if ( strcasecmp( argv[0], "dirtyread" ) == 0 ) {
+		bdb->bi_db_opflags |= DB_DIRTY_READ;
+#endif
 	/* transaction checkpoint configuration */
 	} else if ( strcasecmp( argv[0], "dbnosync" ) == 0 ) {
 		bdb->bi_dbenv_xflags |= DB_TXN_NOSYNC;
@@ -84,6 +88,9 @@ bdb_db_config(
 		} else if( strcasecmp( argv[1], "youngest" ) == 0 ) {
 			bdb->bi_lock_detect = DB_LOCK_YOUNGEST;
 
+		} else if( strcasecmp( argv[1], "fewest" ) == 0 ) {
+			bdb->bi_lock_detect = DB_LOCK_MINLOCKS;
+
 		} else {
 			fprintf( stderr, "%s: line %d: "
 				"bad policy (%s) in \"lockDetect <policy> <seconds>\" line\n",
@@ -114,7 +121,6 @@ bdb_db_config(
 		}
 		bdb->bi_dbenv_mode = strtol( argv[1], NULL, 0 );
 
-#if BDB_FILTER_INDICES
 	/* attribute to index */
 	} else if ( strcasecmp( argv[0], "index" ) == 0 ) {
 		int rc;
@@ -132,7 +138,16 @@ bdb_db_config(
 		rc = bdb_attr_index_config( bdb, fname, lineno, argc - 1, &argv[1] );
 
 		if( rc != LDAP_SUCCESS ) return 1;
-#endif
+
+	/* size of the cache in entries */
+         } else if ( strcasecmp( argv[0], "cachesize" ) == 0 ) {
+                 if ( argc < 2 ) {
+                         fprintf( stderr,
+                 "%s: line %d: missing size in \"cachesize <size>\" line\n",
+                             fname, lineno );
+                         return( 1 );
+                 }
+                 bdb->bi_cache.c_maxsize = atoi( argv[1] );
 
 	/* anything else */
 	} else {