ITS#5956 only retry attaching to SHM once

[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 6493a4583c96d75d380fb6cd3cd25fe4a0074035..0219e3ff14056d153a3536c058279de30daa2340 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-2008 The OpenLDAP Foundation.
+ * Copyright 2000-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,10 +54,6 @@ LDAP_BEGIN_DECL
 #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 */
@@ -156,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 */
@@ -178,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;
@@ -226,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;