X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fback-bdb.h;h=f34dec90e45602fc8f558b25eea391e834af6c6c;hb=ea026cb2cf048c3700042e9776b183ddda1120a4;hp=36b821c8aebeca4585afa90a4f4f0726130bd672;hpb=02f29d51c626205c34762e5f66ca20e702edc701;p=openldap diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index 36b821c8ae..f34dec90e4 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2000-2007 The OpenLDAP Foundation. + * Copyright 2000-2011 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,32 +54,6 @@ LDAP_BEGIN_DECL #define BDB_ID2ENTRY_PAGESIZE 16384 #endif -#ifndef BDB_PAGESIZE -#define BDB_PAGESIZE 4096 /* BDB's original default */ -#endif - -/* 4.6.18 redefines cursor->locker */ -#if DB_VERSION_FULL >= 0x04060012 - -struct __db_locker { - u_int32_t id; -}; - -typedef struct __db_locker * BDB_LOCKER; - -extern int __lock_getlocker(DB_LOCKTAB *lt, u_int32_t locker, int create, DB_LOCKER **ret); - -#define CURSOR_SETLOCKER(cursor, id) cursor->locker = id -#define CURSOR_GETLOCKER(cursor) cursor->locker -#else - -typedef u_int32_t BDB_LOCKER; - -#define CURSOR_SETLOCKER(cursor, id) cursor->locker = id -#define CURSOR_GETLOCKER(cursor) cursor->locker - -#endif - #define DEFAULT_CACHE_SIZE 1000 /* The default search IDL stack cache depth */ @@ -106,7 +80,7 @@ typedef struct bdb_entry_info { * 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 @@ -151,14 +125,14 @@ typedef struct bdb_cache { EntryInfo *c_lruhead; /* lru - add accessed entries here */ EntryInfo *c_lrutail; /* lru - rem lru entries from here */ EntryInfo c_dntree; - unsigned c_maxsize; - int c_cursize; - unsigned c_minfree; - unsigned c_eimax; - int c_eiused; /* EntryInfo's in use */ - int c_leaves; /* EntryInfo leaf nodes */ + ID c_maxsize; + ID c_cursize; + ID c_minfree; + ID c_eimax; + ID c_eiused; /* EntryInfo's in use */ + ID c_leaves; /* EntryInfo leaf nodes */ int c_purging; - BDB_LOCKER 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; @@ -178,6 +152,12 @@ struct bdb_db_info { 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 */ @@ -200,9 +180,10 @@ struct bdb_info { 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; @@ -218,13 +199,13 @@ struct bdb_info { struct re_s *bi_txn_cp_task; struct re_s *bi_index_task; - int bi_lock_detect; + u_int32_t bi_lock_detect; long bi_shm_key; ID bi_lastid; ldap_pvt_thread_mutex_t bi_lastid_mutex; - unsigned bi_idl_cache_max_size; - int bi_idl_cache_size; + ID bi_idl_cache_max_size; + ID bi_idl_cache_size; Avlnode *bi_idl_tree; bdb_idl_cache_entry_t *bi_idl_lru_head; bdb_idl_cache_entry_t *bi_idl_lru_tail; @@ -233,6 +214,8 @@ struct bdb_info { 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 @@ -246,6 +229,7 @@ struct bdb_info { #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; @@ -258,18 +242,21 @@ struct bdb_info { 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; - BDB_LOCKER boi_locker; - u_int32_t boi_err; - 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) @@ -306,20 +293,34 @@ struct bdb_op_info { ((db)->open)(db, NULL, file, name, type, flags, mode) #endif -/* BDB 4.6.18 makes locker a struct instead of an int */ -#if DB_VERSION_FULL >= 0x04060012 -#undef TXN_ID -#define TXN_ID(txn) (txn)->locker +/* #undef BDB_LOG_DEBUG */ + +#ifdef BDB_LOG_DEBUG + +/* 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 +/* !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 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 @@ -335,7 +336,7 @@ struct bdb_op_info { /* 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