Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[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 16bc3dc3538acfb3404beb20e6f7e5ff07980237..97497221fb5460dae5837c7aaca8e727d16e7a2c 100644 (file)
--- 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 <http://www.openldap.org/>.
  *
- * Copyright 2000-2009 The OpenLDAP Foundation.
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,6 @@ typedef struct bdb_entry_info {
 #define        CACHE_ENTRY_ONELEVEL    0x40
 #define        CACHE_ENTRY_REFERENCED  0x80
 #define        CACHE_ENTRY_NOT_CACHED  0x100
-#define        CACHE_ENTRY_PURGED      0x200
        int bei_finders;
 
        /*
@@ -126,12 +125,12 @@ 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;
        DB_TXN  *c_txn; /* used by lru cleaner */
        ldap_pvt_thread_rdwr_t c_rwlock;
@@ -200,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;