From: Howard Chu <hyc@symas.com>
Date: Wed, 10 Aug 2011 22:48:58 +0000 (-0700)
Subject: Don't malloc the free_pgs list every time
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~148^2~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e3b668e84a769634baa64d255ca354890ed951f7;p=openldap

Don't malloc the free_pgs list every time
---

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 10dd09a4c5..7cb64417a4 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -316,6 +316,7 @@ struct MDB_env {
 	MDB_db		*me_dbs[2];
 	MDB_oldpages *me_pghead;
 	pthread_key_t	me_txkey;	/* thread-key for readers */
+	pgno_t		me_free_pgs[MDB_IDL_UM_SIZE];
 };
 
 #define NODESIZE	 offsetof(MDB_node, mn_data)
@@ -610,12 +611,7 @@ mdb_txn_begin(MDB_env *env, int rdonly, MDB_txn **ret)
 
 		pthread_mutex_lock(&env->me_txns->mt_wmutex);
 		env->me_txns->mt_txnid++;
-		txn->mt_free_pgs = malloc(MDB_IDL_UM_SIZEOF);
-		if (txn->mt_free_pgs == NULL) {
-			free(txn->mt_u.dirty_queue);
-			free(txn);
-			return ENOMEM;
-		}
+		txn->mt_free_pgs = env->me_free_pgs;
 		txn->mt_free_pgs[0] = 0;
 	}
 
@@ -703,7 +699,6 @@ mdb_txn_abort(MDB_txn *txn)
 			STAILQ_REMOVE_HEAD(txn->mt_u.dirty_queue, h.md_next);
 			free(dp);
 		}
-		free(txn->mt_free_pgs);
 		free(txn->mt_u.dirty_queue);
 
 		while ((mop = txn->mt_env->me_pghead)) {
@@ -917,7 +912,6 @@ mdb_txn_commit(MDB_txn *txn)
 	}
 
 	pthread_mutex_unlock(&env->me_txns->mt_wmutex);
-	free(txn->mt_free_pgs);
 	free(txn->mt_u.dirty_queue);
 	free(txn);
 	txn = NULL;