highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-09 04:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

CWalletDB: Store the update counter per wallet

Browse Source
This commit is contained in:
Luke Dashjr
2017-03-09 20:56:58 +00:00
parent 74e8738961
commit 19b3648bb5
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/wallet/walletdb.cpp
View File

@@ -22,8 +22,6 @@
#include <boost/foreach.hpp>
#include <boost/thread.hpp>
static std::atomic<unsigned int> nWalletDBUpdateCounter;
//
// CWalletDB
//
@@ -762,20 +760,22 @@ void MaybeCompactWalletDB()
return;
}
static unsigned int nLastSeen = CWalletDB::GetUpdateCounter();
static unsigned int nLastFlushed = CWalletDB::GetUpdateCounter();
CWalletDBWrapper& dbh = pwalletMain->GetDBHandle();
static unsigned int nLastSeen = dbh.GetUpdateCounter();
static unsigned int nLastFlushed = dbh.GetUpdateCounter();
static int64_t nLastWalletUpdate = GetTime();
if (nLastSeen != CWalletDB::GetUpdateCounter())
if (nLastSeen != dbh.GetUpdateCounter())
{
nLastSeen = CWalletDB::GetUpdateCounter();
nLastSeen = dbh.GetUpdateCounter();
nLastWalletUpdate = GetTime();
}
if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2)
if (nLastFlushed != dbh.GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2)
{
if (CDB::PeriodicFlush(pwalletMain->GetDBHandle())) {
nLastFlushed = CWalletDB::GetUpdateCounter();
if (CDB::PeriodicFlush(dbh)) {
nLastFlushed = dbh.GetUpdateCounter();
}
}
fOneThread = false;
@@ -845,16 +845,6 @@ bool CWalletDB::WriteHDChain(const CHDChain& chain)
return WriteIC(std::string("hdchain"), chain);
}
void CWalletDB::IncrementUpdateCounter()
{
nWalletDBUpdateCounter++;
}
unsigned int CWalletDB::GetUpdateCounter()
{
return nWalletDBUpdateCounter;
}
bool CWalletDB::TxnBegin()
{
return batch.TxnBegin();