Add calls to module_init/module_kill to support dynamically loaded backends.

[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 784bbc89aaa40eeffa247c368991d747d9db1dc7..d724733552cf6994e43c9eea0765e828c8354759 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -15,7 +15,6 @@
 
 LDAP_BEGIN_DECL
 
-#define BDB_IDL_MULTI          1
 /* #define BDB_HIER            1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
@@ -50,22 +49,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
@@ -143,6 +134,9 @@ 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)
@@ -153,8 +147,8 @@ struct bdb_op_info {
 #define TXN_COMMIT(txn,f)                      txn_commit((txn), (f))
 #define        TXN_ABORT(txn)                          txn_abort((txn))
 #define TXN_ID(txn)                                    txn_id(txn)
-#define LOCK_ID(env, locker)           lock_id(env, locker)
-#define LOCK_ID_FREE(env, locker)      lock_id_free(env, locker)
+#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)
@@ -165,8 +159,26 @@ struct bdb_op_info {
 #define TXN_COMMIT(txn,f)                      (txn)->commit((txn), (f))
 #define TXN_ABORT(txn)                         (txn)->abort((txn))
 #define TXN_ID(txn)                                    (txn)->id(txn)
-#define LOCK_ID(env, locker)           (env)->lock_id(env, locker)
-#define LOCK_ID_FREE(env, locker)      (env)->lock_id_free(env, locker)
+#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