Never let ldif_parse_line() return a NULL value with success.

[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 8a8417a327067c4ea7ff508094de797836f62f5e..b896191e27b9cbd8c4f439db1dd29fd57d17b6b9 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -9,13 +9,11 @@
 #define _BACK_BDB_H_
 
 #include <portable.h>
-#include <db.h>
-
 #include "slap.h"
+#include <db.h>
 
 LDAP_BEGIN_DECL
 
-#define BDB_IDL_MULTI          1
 /* #define BDB_HIER            1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
@@ -28,15 +26,9 @@ LDAP_BEGIN_DECL
 #define bv2DBT(bv,t)           ((t)->data = (bv)->bv_val, \
                                                                (t)->size = (bv)->bv_len )
 
-#define DEFAULT_MODE           0600
+#define BDB_TXN_RETRIES                16
 
-#define BDB_TXN_RETRIES        16
-
-#ifdef BDB_HIER
-#define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-hdb"
-#else
-#define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
-#endif
+#define BDB_MAX_ADD_LOOP       30
 
 #ifdef BDB_SUBDIRS
 #define BDB_TMP_SUBDIR LDAP_DIRSEP "tmp"
@@ -56,22 +48,14 @@ LDAP_BEGIN_DECL
 /* The bdb on-disk entry format is pretty space-inefficient. Average
  * sized user entries are 3-4K each. You need at least two entries to
  * fit into a single database page, more is better. 64K is BDB's
- * upper bound. The same issues arise with IDLs in the index databases,
- * but it's nearly impossible to avoid overflows there.
- *
- * When using BDB_IDL_MULTI, the IDL size is no longer an issue. Smaller
- * pages are better for concurrency.
+ * upper bound. Smaller pages are better for concurrency.
  */
 #ifndef BDB_ID2ENTRY_PAGESIZE
 #define        BDB_ID2ENTRY_PAGESIZE   16384
 #endif
 
 #ifndef BDB_PAGESIZE
-#ifdef BDB_IDL_MULTI
 #define        BDB_PAGESIZE    4096    /* BDB's original default */
-#else
-#define        BDB_PAGESIZE    16384
-#endif
 #endif
 
 #define DEFAULT_CACHE_SIZE     1000
@@ -84,7 +68,8 @@ typedef struct bdb_cache {
         Avlnode         *c_idtree;
         Entry           *c_lruhead;     /* lru - add accessed entries here */
         Entry           *c_lrutail;     /* lru - rem lru entries from here */
-        ldap_pvt_thread_mutex_t c_mutex;
+        ldap_pvt_thread_rdwr_t c_rwlock;
+        ldap_pvt_thread_mutex_t lru_mutex;
 } Cache;
  
 #define CACHE_READ_LOCK                0
@@ -118,21 +103,19 @@ struct bdb_info {
        Avlnode         *bi_tree;
        ldap_pvt_thread_rdwr_t  bi_tree_rdwr;
        void            *bi_troot;
-       int             bi_nrdns;
 #endif
 
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
        u_int32_t       bi_txn_cp_kbyte;
 
-#ifndef NO_THREADS
        int                     bi_lock_detect;
-       int                     bi_lock_detect_seconds;
-       ldap_pvt_thread_t       bi_lock_detect_tid;
-#endif
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
+#ifdef LDAP_CLIENT_UPDATE
+       LDAP_LIST_HEAD(pl, slap_op) psearch_list;
+#endif
 };
 
 #define bi_id2entry    bi_databases[BDB_ID2ENTRY]
@@ -148,24 +131,51 @@ struct bdb_op_info {
        int                     boi_err;
 };
 
+#define        DB_OPEN(db, file, name, type, flags, mode) \
+       (db)->open(db, file, name, type, flags, mode)
+
 #if DB_VERSION_MAJOR < 4
 #define LOCK_DETECT(env,f,t,a)         lock_detect(env, f, t, a)
 #define LOCK_GET(env,i,f,o,m,l)                lock_get(env, i, f, o, m, l)
+#define LOCK_PUT(env,l)                        lock_put(env, l)
 #define TXN_CHECKPOINT(env,k,m,f)      txn_checkpoint(env, k, m, f)
 #define TXN_BEGIN(env,p,t,f)           txn_begin((env), p, t, f)
 #define TXN_PREPARE(txn,gid)           txn_prepare((txn), (gid))
 #define TXN_COMMIT(txn,f)                      txn_commit((txn), (f))
 #define        TXN_ABORT(txn)                          txn_abort((txn))
 #define TXN_ID(txn)                                    txn_id(txn)
+#define XLOCK_ID(env, locker)          lock_id(env, locker)
+#define XLOCK_ID_FREE(env, locker)     lock_id_free(env, locker)
 #else
 #define LOCK_DETECT(env,f,t,a)         (env)->lock_detect(env, f, t, a)
 #define LOCK_GET(env,i,f,o,m,l)                (env)->lock_get(env, i, f, o, m, l)
+#define LOCK_PUT(env,l)                        (env)->lock_put(env, l)
 #define TXN_CHECKPOINT(env,k,m,f)      (env)->txn_checkpoint(env, k, m, f)
 #define TXN_BEGIN(env,p,t,f)           (env)->txn_begin((env), p, t, f)
 #define TXN_PREPARE(txn,g)                     (txn)->prepare((txn), (g))
 #define TXN_COMMIT(txn,f)                      (txn)->commit((txn), (f))
 #define TXN_ABORT(txn)                         (txn)->abort((txn))
 #define TXN_ID(txn)                                    (txn)->id(txn)
+#define XLOCK_ID(env, locker)          (env)->lock_id(env, locker)
+#define XLOCK_ID_FREE(env, locker)     (env)->lock_id_free(env, locker)
+
+/* 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, 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
 
 LDAP_END_DECL