ITS#4040 move initialization

[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 bee41a46f45580b5b5c1632c4aaf58e62ef95c1d..3f3401df5c0519e38c0d4ca091c42fe055a538a7 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -20,11 +20,10 @@
 #include <portable.h>
 #include "slap.h"
 #include <db.h>
+#include "alock.h"
 
 LDAP_BEGIN_DECL
 
-#undef BDB_PSEARCH
-
 #define DB_VERSION_FULL ((DB_VERSION_MAJOR << 24) | (DB_VERSION_MINOR << 16) | DB_VERSION_PATCH)
 
 #define BDB_SUBENTRIES 1
@@ -43,12 +42,6 @@ LDAP_BEGIN_DECL
 
 #define BDB_MAX_ADD_LOOP       30
 
-#ifdef BDB_SUBDIRS
-#define BDB_TMP_SUBDIR "tmp"
-#define BDB_LG_SUBDIR  "log"
-#define BDB_DATA_SUBDIR        "data"
-#endif
-
 #define BDB_SUFFIX             ".bdb"
 #define BDB_ID2ENTRY   0
 #define BDB_DN2ID              1
@@ -131,6 +124,7 @@ typedef struct bdb_cache {
        int             c_maxsize;
        int             c_cursize;
        int             c_eiused;       /* EntryInfo's in use */
+       int             c_leaves;       /* EntryInfo leaf nodes */
        EntryInfo       c_dntree;
        EntryInfo       *c_eifree;      /* free list */
        Avlnode         *c_idtree;
@@ -178,17 +172,14 @@ struct bdb_info {
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
        u_int32_t       bi_txn_cp_kbyte;
+       void            *bi_txn_cp_task;
+       void            *bi_index_task;
 
        int                     bi_lock_detect;
        long            bi_shm_key;
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#ifdef BDB_PSEARCH
-       LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
-       ldap_pvt_thread_rdwr_t bi_pslist_rwlock;
-       LDAP_LIST_HEAD(se, slap_session_entry) bi_session_list;
-#endif
        int             bi_idl_cache_max_size;
        int             bi_idl_cache_size;
        Avlnode         *bi_idl_tree;
@@ -196,6 +187,19 @@ struct bdb_info {
        bdb_idl_cache_entry_t   *bi_idl_lru_tail;
        ldap_pvt_thread_rdwr_t bi_idl_tree_rwlock;
        ldap_pvt_thread_mutex_t bi_idl_tree_lrulock;
+       alock_info_t    bi_alock_info;
+       char            *bi_db_config_path;
+       BerVarray       bi_db_config;
+       int             bi_flags;
+#define        BDB_IS_OPEN             0x01
+#define        BDB_HAS_CONFIG  0x02
+#define        BDB_UPD_CONFIG  0x04
+#define        BDB_DEL_INDEX   0x08
+#define        BDB_RE_OPEN             0x10
+#ifdef BDB_HIER
+       int             bi_modrdns;             /* number of modrdns completed */
+       ldap_pvt_thread_mutex_t bi_modrdns_mutex;
+#endif
 };
 
 #define bi_id2entry    bi_databases[BDB_ID2ENTRY]
@@ -248,7 +252,7 @@ struct bdb_op_info {
 #if DB_VERSION_FULL >= 0x04010011
 #undef DB_OPEN
 #define        DB_OPEN(db, file, name, type, flags, mode) \
-       (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode)
+       (db)->open(db, NULL, file, name, type, flags, mode)
 #endif
 
 #endif
@@ -261,24 +265,38 @@ struct bdb_op_info {
 
 /* Copy an ID "src" to pointer "dst" in big-endian byte order */
 #define BDB_ID2DISK( src, dst )        \
-       do { int i0; ID tmp; char *ptr; \
-               tmp = (src); ptr = (char *)(dst);       \
+       do { int i0; ID tmp; unsigned char *_p; \
+               tmp = (src); _p = (unsigned char *)(dst);       \
                for ( i0=sizeof(ID)-1; i0>=0; i0-- ) {  \
-                       ptr[i0] = tmp & 0xff; tmp >>= 8;        \
+                       _p[i0] = tmp & 0xff; tmp >>= 8; \
                } \
-       } while(0);
+       } while(0)
 
 /* 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 *ptr;    \
-               ptr = (unsigned char *)(src);   \
+       do { int i0; ID tmp = 0; unsigned char *_p;     \
+               _p = (unsigned char *)(src);    \
                for ( i0=0; i0<sizeof(ID); i0++ ) {     \
-                       tmp <<= 8; tmp |= *ptr++;       \
+                       tmp <<= 8; tmp |= *_p++;        \
                } *(dst) = tmp; \
-       } while (0);
+       } while (0)
 
 LDAP_END_DECL
 
+/* for the cache of attribute information (which are indexed, etc.) */
+typedef struct bdb_attrinfo {
+       AttributeDescription *ai_desc; /* attribute description cn;lang-en */
+       slap_mask_t ai_indexmask;       /* how the attr is indexed      */
+       slap_mask_t ai_newmask; /* new settings to replace old mask */
+#ifdef LDAP_COMP_MATCH
+       ComponentReference* ai_cr; /*component indexing*/
+#endif
+} AttrInfo;
+
+/* These flags must not clash with SLAP_INDEX flags or ops in slap.h! */
+#define        BDB_INDEX_DELETING      0x8000U /* index is being modified */
+#define        BDB_INDEX_UPDATE_OP     0x03    /* performing an index update */
+
 #include "proto-bdb.h"
 
 #endif /* _BACK_BDB_H_ */