From: Howard Chu <hyc@symas.com>
Date: Wed, 18 Jun 2014 10:02:08 +0000 (-0700)
Subject: Shorten search for ovpage space
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~129^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2db55c7d999bafe488550af10fa722d47b93d1c5;p=openldap

Shorten search for ovpage space
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 4377ee8ea6..c48fb28c0a 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1779,6 +1779,10 @@ mdb_page_dirty(MDB_txn *txn, MDB_page *mp)
 static int
 mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
 {
+/* use PARANOID for now, default infinite search slows down too much
+ * when the freelist is large
+ */
+#define MDB_PARANOID
 #ifdef MDB_PARANOID	/* Seems like we can ignore this now */
 	/* Get at most <Max_retries> more freeDB records once me_pghead
 	 * has enough pages.  If not enough, use new pages from the map.
@@ -1790,7 +1794,7 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
 #else
 	enum { Paranoid = 0, Max_retries = INT_MAX /*infinite*/ };
 #endif
-	int rc, retry = Max_retries;
+	int rc, retry = num;
 	MDB_txn *txn = mc->mc_txn;
 	MDB_env *env = txn->mt_env;
 	pgno_t pgno, *mop = env->me_pghead;