X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fback-ldbm.h;h=b4f16656e087d04b256c40871a53cb866d3e8331;hb=aa3b69eb32f3292340b1af8c7733aafaf6f2f6e5;hp=a84c5201e1f49319fb0dc9efae26f17a24b1087a;hpb=bf3a2294231de245cd5d76d0f90473521a0f1fbf;p=openldap

diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index a84c5201e1..b4f16656e0 100644
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -1,7 +1,7 @@
 /* back-ldbm.h - ldap ldbm back-end header file */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,34 +14,23 @@ LDAP_BEGIN_DECL
 
 #define DEFAULT_CACHE_SIZE	1000
 
-#ifdef HAVE_BERKELEY_DB2
+#if defined(HAVE_BERKELEY_DB) && DB_VERSION_MAJOR >= 2
 #	define DEFAULT_DBCACHE_SIZE (100 * DEFAULT_DB_PAGE_SIZE)
 #else
 #	define DEFAULT_DBCACHE_SIZE 100000
 #endif
 
-#define DEFAULT_DB_DIRECTORY	LDAP_RUNDIR LDAP_DIRSEP "openldap-ldbm"
-#define DEFAULT_MODE		0600
-
-#define SUBLEN			3
-
-#define DN_BASE_PREFIX		'='
-#define DN_ONE_PREFIX	 	'@'
-#define DN_SUBTREE_PREFIX 	'?'
+#define DN_BASE_PREFIX		SLAP_INDEX_EQUALITY_PREFIX
+#define DN_ONE_PREFIX	 	'%'
+#define DN_SUBTREE_PREFIX 	'@'
 
 /*
  * there is a single index for each attribute.  these prefixes ensure
  * that there is no collision among keys.
  */
-#define EQ_PREFIX	'='	/* prefix for equality keys     */
-#define APPROX_PREFIX	'~'	/* prefix for approx keys       */
-#define SUB_PREFIX	'*'	/* prefix for substring keys    */
-#define CONT_PREFIX	'\\'	/* prefix for continuation keys */
-
-/* allow 3 characters per byte + PREFIX + EOS */
-#define CONT_SIZE ( sizeof(long)*3 + 1 + 1 )
 
-#define UNKNOWN_PREFIX	'?'	/* prefix for unknown keys    */
+/* allow PREFIX + byte for continuate number */
+#define SLAP_INDEX_CONT_SIZE ( sizeof(SLAP_INDEX_CONT_PREFIX) + sizeof(unsigned char) )
 
 #define DEFAULT_BLOCKSIZE	8192
 
@@ -69,6 +58,11 @@ typedef ID ID_BLOCK;
 /* all ID_BLOCK macros operate on a pointer to a ID_BLOCK */
 
 #define ID_BLOCK_NMAX(b)		((b)[ID_BLOCK_NMAX_OFFSET])
+
+/* Use this macro to get the value, but not to set it.
+ * By default this is identical to above.
+ */
+#define	ID_BLOCK_NMAXN(b)		ID_BLOCK_NMAX(b)
 #define ID_BLOCK_NIDS(b)		((b)[ID_BLOCK_NIDS_OFFSET])
 #define ID_BLOCK_ID(b, n)		((b)[ID_BLOCK_IDS_OFFSET+(n)])
 
@@ -80,6 +74,23 @@ typedef ID ID_BLOCK;
 #define ID_BLOCK_INDIRECT_VALUE	0
 #define ID_BLOCK_INDIRECT(b)	(ID_BLOCK_NIDS(b) == ID_BLOCK_INDIRECT_VALUE)
 
+#define	USE_INDIRECT_NIDS	1
+
+#ifdef USE_INDIRECT_NIDS
+/*
+ * Use the high bit of ID_BLOCK_NMAX to indicate an INDIRECT block, thus
+ * freeing up the ID_BLOCK_NIDS to store an actual count. This allows us
+ * to use binary search on INDIRECT blocks.
+ */
+#undef	ID_BLOCK_NMAXN
+#define	ID_BLOCK_NMAXN(b)		((b)[ID_BLOCK_NMAX_OFFSET]&0x7fffffff)
+#undef	ID_BLOCK_INDIRECT_VALUE
+#define	ID_BLOCK_INDIRECT_VALUE	0x80000000
+#undef	ID_BLOCK_INDIRECT
+#define	ID_BLOCK_INDIRECT(b)	(ID_BLOCK_NMAX(b) & ID_BLOCK_INDIRECT_VALUE)
+
+#endif	/* USE_INDIRECT_NIDS */
+
 /* for the in-core cache of entries */
 typedef struct ldbm_cache {
 	int		c_maxsize;
@@ -99,20 +110,22 @@ typedef struct ldbm_dbcache {
 	int		dbc_refcnt;
 	int		dbc_maxids;
 	int		dbc_maxindirect;
+	int		dbc_dirty;
+	int		dbc_flags;
 	time_t	dbc_lastref;
 	long	dbc_blksize;
 	char	*dbc_name;
 	LDBM	dbc_db;
+	ldap_pvt_thread_mutex_t	dbc_write_mutex;
 } DBCache;
 
-#define MAXDBCACHE	16
+#define MAXDBCACHE	128
 
 struct ldbminfo {
+	ldap_pvt_thread_rdwr_t		li_giant_rwlock;
 	ID			li_nextid;
-	ldap_pvt_thread_mutex_t		li_nextid_mutex;
-	ldap_pvt_thread_mutex_t		li_root_mutex;
-	ldap_pvt_thread_mutex_t		li_add_mutex;
 	int			li_mode;
+	slap_mask_t	li_defaultmask;
 	char			*li_directory;
 	Cache		li_cache;
 	Avlnode			*li_attrs;
@@ -122,9 +135,13 @@ struct ldbminfo {
 	DBCache		li_dbcache[MAXDBCACHE];
 	ldap_pvt_thread_mutex_t		li_dbcache_mutex;
 	ldap_pvt_thread_cond_t		li_dbcache_cv;
-#ifdef HAVE_BERKELEY_DB2
-	DB_ENV                      li_db_env;
-#endif
+	DB_ENV			*li_dbenv;
+	int			li_envdirok;
+	int			li_dbsyncfreq;
+	int			li_dbsyncwaitn;
+	int			li_dbsyncwaitinterval;
+	ldap_pvt_thread_t	li_dbsynctid;
+	int			li_dbshutdown;
 };
 
 LDAP_END_DECL