diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-05 13:02:16 -0700 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-05 13:02:16 -0700 |
commit | 0167938c26d8db4f39b6fe651d03b548e199326e (patch) | |
tree | 0652ba43ec8a6efe9ee352d70078144df6495e3d /src/db.cpp | |
parent | 399ff1fe05aba8bdde092144eb524198a810f3ac (diff) | |
parent | e88ed65a39eb86ffd4d0720852d7e5f3d021f792 (diff) | |
download | bitcoin-0167938c26d8db4f39b6fe651d03b548e199326e.tar.xz |
Merge pull request #1045 from sipa/fastblocks2
Flush on log size instead of transaction count
Diffstat (limited to 'src/db.cpp')
-rw-r--r-- | src/db.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/db.cpp b/src/db.cpp index 2a09e2e673..b86a56e416 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -28,7 +28,6 @@ static bool fDbEnvInit = false; DbEnv dbenv(0); static map<string, int> mapFileUseCount; static map<string, Db*> mapDb; -static int64 nTxn = 0; static void EnvShutdown() { @@ -164,13 +163,7 @@ void CDB::Close() if (strFile == "blkindex.dat" && IsInitialBlockDownload()) nMinutes = 5; - if (nMinutes == 0 || nTxn > 200000) - { - nTxn = 0; - nMinutes = 0; - } - - dbenv.txn_checkpoint(0, nMinutes, 0); + dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0); CRITICAL_BLOCK(cs_db) --mapFileUseCount[strFile]; @@ -344,7 +337,6 @@ bool CTxDB::ReadTxIndex(uint256 hash, CTxIndex& txindex) bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex) { assert(!fClient); - nTxn++; return Write(make_pair(string("tx"), hash), txindex); } @@ -355,7 +347,6 @@ bool CTxDB::AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeigh // Add to tx index uint256 hash = tx.GetHash(); CTxIndex txindex(pos, tx.vout.size()); - nTxn++; return Write(make_pair(string("tx"), hash), txindex); } |