From 4918ce83018aef9d80e3c9ed2035b22dd5cddac9 Mon Sep 17 00:00:00 2001
From: Martin Kobetic <mkobetic@gmail.com>
Date: Tue, 17 Jun 2014 19:30:10 +0000
Subject: drop mergeStats and move freelist stats update to Tx

---
 db.go | 16 +++++-----------
 tx.go | 10 +++++++++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/db.go b/db.go
index f58da8c..13bfb16 100644
--- a/db.go
+++ b/db.go
@@ -427,12 +427,16 @@ func (db *DB) removeTx(tx *Tx) {
 			break
 		}
 	}
+	n := len(db.txs)
 
 	// Unlock the meta pages.
 	db.metalock.Unlock()
 
 	// Merge statistics.
-	db.mergeStats(&tx.stats)
+	db.statlock.Lock()
+	db.stats.OpenTxN = n
+	db.stats.TxStats.add(&tx.stats)
+	db.statlock.Unlock()
 }
 
 // Update executes a function within the context of a read-write managed transaction.
@@ -550,16 +554,6 @@ func (db *DB) allocate(count int) (*page, error) {
 	return p, nil
 }
 
-// mergeStats updates db stats in thread-safe manner.
-func (db *DB) mergeStats(txStats *TxStats) {
-	db.statlock.Lock()
-	db.stats.FreelistN = db.freelist.count()
-	db.stats.FreelistAlloc = db.freelist.size()
-	db.stats.OpenTxN = len(db.txs)
-	db.stats.TxStats.add(txStats)
-	db.statlock.Unlock()
-}
-
 // Stats represents statistics about the database.
 type Stats struct {
 	// Freelist stats
diff --git a/tx.go b/tx.go
index 5cb99e0..bcbcd5f 100644
--- a/tx.go
+++ b/tx.go
@@ -232,11 +232,19 @@ func (tx *Tx) rollback() {
 
 func (tx *Tx) close() {
 	if tx.writable {
+		// Grab freelist stats.
+		var freelistN = tx.db.freelist.count()
+		var freelistAlloc = tx.db.freelist.size()
+
 		// Remove writer lock.
 		tx.db.rwlock.Unlock()
 
 		// Merge statistics.
-		tx.db.mergeStats(&tx.stats)
+		tx.db.statlock.Lock()
+		tx.db.stats.FreelistN = freelistN
+		tx.db.stats.FreelistAlloc = freelistAlloc
+		tx.db.stats.TxStats.add(&tx.stats)
+		tx.db.statlock.Unlock()
 	} else {
 		tx.db.removeTx(tx)
 	}
-- 
cgit v1.2.3