Unify use of BDB lockers

[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 28664b21a44b60d4950a7c64c9f265f4007bb5cb..534062b53d7d72c8989f614e6e5a3ceaef725581 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -68,9 +68,9 @@ LDAP_BEGIN_DECL
 
 typedef struct bdb_idl_cache_entry_s {
        struct berval kstr;
-       ldap_pvt_thread_rdwr_t idl_entry_rwlock;
        ID      *idl;
        DB      *db;
+       int             idl_flags;
        struct bdb_idl_cache_entry_s* idl_lru_prev;
        struct bdb_idl_cache_entry_s* idl_lru_next;
 } bdb_idl_cache_entry_t;
@@ -122,17 +122,16 @@ typedef struct bdb_entry_info {
 
 /* for the in-core cache of entries */
 typedef struct bdb_cache {
+       EntryInfo       *c_eifree;      /* free list */
+       Avlnode         *c_idtree;
+       EntryInfo       *c_lruhead;     /* lru - add accessed entries here */
+       EntryInfo       *c_lrutail;     /* lru - rem lru entries from here */
+       EntryInfo       c_dntree;
        int             c_maxsize;
        int             c_cursize;
        int             c_minfree;
        int             c_eiused;       /* EntryInfo's in use */
        int             c_leaves;       /* EntryInfo leaf nodes */
-       u_int32_t       c_locker;       /* used by lru cleaner */
-       EntryInfo       c_dntree;
-       EntryInfo       *c_eifree;      /* free list */
-       Avlnode         *c_idtree;
-       EntryInfo       *c_lruhead;     /* lru - add accessed entries here */
-       EntryInfo       *c_lrutail;     /* lru - rem lru entries from here */
        ldap_pvt_thread_rdwr_t c_rwlock;
        ldap_pvt_thread_mutex_t lru_head_mutex;
        ldap_pvt_thread_mutex_t lru_tail_mutex;