Sync with HEAD as of 14-March-2004

[openldap] / servers / slapd / back-bdb / back-bdb.h

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index feccc5bf4efc6b1785982709f2c7e97ea9f7d8ec..3420b0d9a15cfb12c55cf6ee38a7d8e1325168b3 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -1,8 +1,17 @@
 /* back-bdb.h - bdb back-end header file */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _BACK_BDB_H_
@@ -14,7 +23,7 @@
 
 LDAP_BEGIN_DECL
 
-/* #define BDB_HIER            1 */
+#define BDB_SUBENTRIES 1
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -40,11 +49,7 @@ LDAP_BEGIN_DECL
 
 #define BDB_SUFFIX             ".bdb"
 #define BDB_ID2ENTRY   0
-#ifdef BDB_HIER
-#define BDB_ID2PARENT          1
-#else
 #define BDB_DN2ID              1
-#endif
 #define BDB_NDB                        2
 
 /* The bdb on-disk entry format is pretty space-inefficient. Average
@@ -90,12 +95,19 @@ typedef struct bdb_entry_info {
        int bei_state;
 #define        CACHE_ENTRY_DELETED     1
 #define        CACHE_ENTRY_NO_KIDS     2
+#define        CACHE_ENTRY_NOT_LINKED  4
+#define CACHE_ENTRY_NO_GRANDKIDS       8
 
        /*
         * remaining fields require backend cache lock to access
         */
        struct berval bei_nrdn;
+#ifdef BDB_HIER
        struct berval bei_rdn;
+       int     bei_modrdns;    /* track renames */
+       int     bei_ckids;      /* number of kids cached */
+       int     bei_dkids;      /* number of kids on-disk, plus 1 */
+#endif
        Entry   *bei_e;
        Avlnode *bei_kids;
        ldap_pvt_thread_mutex_t bei_kids_mutex;
@@ -111,6 +123,7 @@ typedef struct bdb_cache {
        int             c_maxsize;
        int             c_cursize;
        EntryInfo       c_dntree;
+       EntryInfo       *c_eifree;      /* free list */
        Avlnode         *c_idtree;
        EntryInfo       *c_lruhead;     /* lru - add accessed entries here */
        EntryInfo       *c_lrutail;     /* lru - rem lru entries from here */
@@ -139,6 +152,7 @@ struct bdb_info {
 
        int                     bi_ndatabases;
        struct bdb_db_info **bi_databases;
+       ldap_pvt_thread_mutex_t bi_database_mutex;
        int             bi_db_opflags;  /* db-specific flags */
 
        slap_mask_t     bi_defaultmask;
@@ -146,11 +160,6 @@ struct bdb_info {
        Avlnode         *bi_attrs;
        void            *bi_search_stack;
        int             bi_search_stack_depth;
-#ifdef BDB_HIER
-       Avlnode         *bi_tree;
-       ldap_pvt_thread_rdwr_t  bi_tree_rdwr;
-       void            *bi_troot;
-#endif
 
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
@@ -161,9 +170,9 @@ struct bdb_info {
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
        LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
-#endif
+       ldap_pvt_thread_rdwr_t bi_pslist_rwlock;
+       LDAP_LIST_HEAD(se, slap_session_entry) bi_session_list;
 #ifdef SLAP_IDL_CACHE
        int             bi_idl_cache_max_size;
        int             bi_idl_cache_size;
@@ -176,11 +185,7 @@ struct bdb_info {
 };
 
 #define bi_id2entry    bi_databases[BDB_ID2ENTRY]
-#ifdef BDB_HIER
-#define bi_id2parent   bi_databases[BDB_ID2PARENT]
-#else
 #define bi_dn2id       bi_databases[BDB_DN2ID]
-#endif
 
 struct bdb_op_info {
        BackendDB*      boi_bdb;
@@ -191,7 +196,7 @@ struct bdb_op_info {
        int             boi_acl_cache;
 };
 
-#define        DB_OPEN(db, txn, file, name, type, flags, mode) \
+#define        DB_OPEN(db, file, name, type, flags, mode) \
        (db)->open(db, file, name, type, flags, mode)
 
 #if DB_VERSION_MAJOR < 4
@@ -222,21 +227,17 @@ struct bdb_op_info {
 /* BDB 4.1.17 adds txn arg to db->open */
 #if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17
 #undef DB_OPEN
-#define        DB_OPEN(db, txn, file, name, type, flags, mode) \
-       (db)->open(db, txn, file, name, type, flags, mode)
+#define        DB_OPEN(db, file, name, type, flags, mode) \
+       (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode)
 #endif
 
-#define BDB_REUSE_LOCKERS
-
-#ifdef BDB_REUSE_LOCKERS
-#define        LOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)
-#else
-#define        LOCK_ID_FREE(env, locker)       XLOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)            XLOCK_ID(env, locker)
 #endif
 
-#endif
+#define BDB_REUSE_LOCKERS
+
+#define BDB_CSN_COMMIT 0
+#define BDB_CSN_ABORT  1
+#define BDB_CSN_RETRY  2
 
 LDAP_END_DECL