/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2007 The OpenLDAP Foundation.
+ * Copyright 2000-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#define BDB_ID2ENTRY_PAGESIZE 16384
#endif
-#ifndef BDB_PAGESIZE
-#define BDB_PAGESIZE 4096 /* BDB's original default */
-#endif
-
#define DEFAULT_CACHE_SIZE 1000
/* The default search IDL stack cache depth */
* to avoid conflicting with BDB's internal locks. So add a byte here
* that is always zero.
*/
- char bei_lockpad;
+ short bei_lockpad;
short bei_state;
#define CACHE_ENTRY_DELETED 1
#define CACHE_ENTRY_WALKING 0x20
#define CACHE_ENTRY_ONELEVEL 0x40
#define CACHE_ENTRY_REFERENCED 0x80
+#define CACHE_ENTRY_NOT_CACHED 0x100
int bei_finders;
/*
EntryInfo *c_lruhead; /* lru - add accessed entries here */
EntryInfo *c_lrutail; /* lru - rem lru entries from here */
EntryInfo c_dntree;
- int c_maxsize;
+ unsigned c_maxsize;
int c_cursize;
- int c_minfree;
- int c_eimax;
+ unsigned c_minfree;
+ unsigned c_eimax;
int c_eiused; /* EntryInfo's in use */
int c_leaves; /* EntryInfo leaf nodes */
int c_purging;
- u_int32_t c_locker; /* used by lru cleaner */
+ DB_TXN *c_txn; /* used by lru cleaner */
ldap_pvt_thread_rdwr_t c_rwlock;
ldap_pvt_thread_mutex_t c_lru_mutex;
ldap_pvt_thread_mutex_t c_count_mutex;
#define BDB_INDICES 128
struct bdb_db_info {
- char *bdi_name;
+ struct berval bdi_name;
DB *bdi_db;
};
+struct bdb_db_pgsize {
+ struct bdb_db_pgsize *bdp_next;
+ struct berval bdp_name;
+ int bdp_size;
+};
+
+#ifdef LDAP_DEVEL
+#define BDB_MONITOR_IDX
+#endif /* LDAP_DEVEL */
+
typedef struct bdb_monitor_t {
void *bdm_cb;
- struct berval bdm_nbase;
- int bdm_scope;
- struct berval bdm_filter;
+ struct berval bdm_ndn;
} bdb_monitor_t;
/* From ldap_rq.h */
int bi_dbenv_mode;
int bi_ndatabases;
+ int bi_db_opflags; /* db-specific flags */
struct bdb_db_info **bi_databases;
ldap_pvt_thread_mutex_t bi_database_mutex;
- int bi_db_opflags; /* db-specific flags */
+ struct bdb_db_pgsize *bi_pagesizes;
slap_mask_t bi_defaultmask;
Cache bi_cache;
ID bi_lastid;
ldap_pvt_thread_mutex_t bi_lastid_mutex;
- int bi_idl_cache_max_size;
+ unsigned bi_idl_cache_max_size;
int bi_idl_cache_size;
Avlnode *bi_idl_tree;
bdb_idl_cache_entry_t *bi_idl_lru_head;
alock_info_t bi_alock_info;
char *bi_db_config_path;
BerVarray bi_db_config;
+ char *bi_db_crypt_file;
+ struct berval bi_db_crypt_key;
bdb_monitor_t bi_monitor;
#ifdef BDB_MONITOR_IDX
#define BDB_UPD_CONFIG 0x04
#define BDB_DEL_INDEX 0x08
#define BDB_RE_OPEN 0x10
+#define BDB_CHKSUM 0x20
#ifdef BDB_HIER
int bi_modrdns; /* number of modrdns completed */
ldap_pvt_thread_mutex_t bi_modrdns_mutex;
#define bi_id2entry bi_databases[BDB_ID2ENTRY]
#define bi_dn2id bi_databases[BDB_DN2ID]
+
struct bdb_lock_info {
struct bdb_lock_info *bli_next;
- ID bli_id;
DB_LOCK bli_lock;
+ ID bli_id;
+ int bli_flag;
};
+#define BLI_DONTFREE 1
struct bdb_op_info {
- BackendDB* boi_bdb;
+ OpExtra boi_oe;
DB_TXN* boi_txn;
- u_int32_t boi_err;
- u_int32_t boi_locker;
- int boi_acl_cache;
struct bdb_lock_info *boi_locks; /* used when no txn */
+ u_int32_t boi_err;
+ char boi_acl_cache;
+ char boi_flag;
};
+#define BOI_DONTFREE 1
#define DB_OPEN(db, file, name, type, flags, mode) \
((db)->open)(db, file, name, type, flags, mode)
((db)->open)(db, NULL, file, name, type, flags, mode)
#endif
-#endif
+/* #undef BDB_LOG_DEBUG */
-/* 4.6.18 redefines cursor->locker */
-#if DB_VERSION_FULL >= 0x04060012
-
-struct __db_locker {
- u_int32_t id;
-};
+#ifdef BDB_LOG_DEBUG
-extern int __lock_getlocker(DB_LOCKTAB *lt, u_int32_t locker, int create, DB_LOCKER **ret);
+/* env->log_printf appeared in 4.4 */
+#if DB_VERSION_FULL >= 0x04040000
+#define BDB_LOG_PRINTF(env,txn,fmt,...) (env)->log_printf((env),(txn),(fmt),__VA_ARGS__)
+#else
+extern int __db_logmsg(const DB_ENV *env, DB_TXN *txn, const char *op, u_int32_t flags,
+ const char *fmt,...);
+#define BDB_LOG_PRINTF(env,txn,fmt,...) __db_logmsg((env),(txn),"DIAGNOSTIC",0,(fmt),__VA_ARGS__)
+#endif
-#define CURSOR_SETLOCKER(cursor, id) \
- __lock_getlocker(cursor->dbp->dbenv->lk_handle, id, 0, &cursor->locker)
-#define CURSOR_GETLOCKER(cursor) cursor->locker->id
+/* !BDB_LOG_DEBUG */
+#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+ (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__STRICT_ANSI__))
+#define BDB_LOG_PRINTF(a,b,c,...)
#else
-#define CURSOR_SETLOCKER(cursor, id) cursor->locker = id
-#define CURSOR_GETLOCKER(cursor) cursor->locker
+#define BDB_LOG_PRINTF (void) /* will evaluate and discard the arguments */
+
+#endif /* BDB_LOG_DEBUG */
+
#endif
#ifndef DB_BUFFER_SMALL
#define DB_BUFFER_SMALL ENOMEM
#endif
-#define BDB_REUSE_LOCKERS
-
#define BDB_CSN_COMMIT 0
#define BDB_CSN_ABORT 1
#define BDB_CSN_RETRY 2
/* Copy a pointer "src" to a pointer "dst" from big-endian to native order */
#define BDB_DISK2ID( src, dst ) \
- do { int i0; ID tmp = 0; unsigned char *_p; \
+ do { unsigned i0; ID tmp = 0; unsigned char *_p; \
_p = (unsigned char *)(src); \
for ( i0=0; i0<sizeof(ID); i0++ ) { \
tmp <<= 8; tmp |= *_p++; \
projects / openldap / blobdiff