Merge pull request #1045 from sipa/fastblocks2
Flush on log size instead of transaction count
This commit is contained in:
commit
0167938c26
2 changed files with 2 additions and 10 deletions
11
src/db.cpp
11
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -171,6 +171,7 @@ bool AppInit2(int argc, char* argv[])
|
|||
" -splash \t\t " + _("Show splash screen on startup (default: 1)") + "\n" +
|
||||
" -datadir=<dir> \t\t " + _("Specify data directory") + "\n" +
|
||||
" -dbcache=<n> \t\t " + _("Set database cache size in megabytes (default: 25)") + "\n" +
|
||||
" -dblogsize=<n> \t\t " + _("Set database disk log size in megabytes (default: 100)") + "\n" +
|
||||
" -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)") + "\n" +
|
||||
" -proxy=<ip:port> \t " + _("Connect through socks4 proxy") + "\n" +
|
||||
" -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" +
|
||||
|
|
Loading…
Reference in a new issue