mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

walletdb: Move PeriodicFlush into WalletDatabase

Browse Source 
Make PeriodicFlush a non-static member of WalletDatabase instead of
WalletBatch.
This commit is contained in:
Andrew Chow 2020-06-15 14:39:26 -04:00
parent 8f1bcf8b7b
commit 91d109156d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/bdb.cpp
View File

@ -614,14 +614,12 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
} }
} }
bool BerkeleyBatch::PeriodicFlush(BerkeleyDatabase& database) bool BerkeleyDatabase::PeriodicFlush()
{ {
if (database.IsDummy()) { if (IsDummy()) {
return true; return true;
} }
bool ret = false; bool ret = false;
BerkeleyEnvironment *env = database.env.get();
const std::string& strFile = database.strFile;
TRY_LOCK(cs_db, lockDb); TRY_LOCK(cs_db, lockDb);
if (lockDb) if (lockDb)
{ {

7
src/wallet/bdb.h
View File

@ -131,6 +131,9 @@ public:
/** Make sure all changes are flushed to disk. /** Make sure all changes are flushed to disk.
*/ */
void Flush(bool shutdown); void Flush(bool shutdown);
/* flush the wallet passively (TRY_LOCK)
ideal to be called periodically */
bool PeriodicFlush();
void IncrementUpdateCounter(); void IncrementUpdateCounter();
@ -215,10 +218,6 @@ public:
void Flush(); void Flush();
void Close(); void Close();
/* flush the wallet passively (TRY_LOCK)
ideal to be called periodically */
static bool PeriodicFlush(BerkeleyDatabase& database);
template <typename K, typename T> template <typename K, typename T>
bool Read(const K& key, T& value) bool Read(const K& key, T& value)
{ {

2
src/wallet/walletdb.cpp
View File

@ -964,7 +964,7 @@ void MaybeCompactWalletDB()
} }
if (dbh.nLastFlushed != nUpdateCounter && GetTime() - dbh.nLastWalletUpdate >= 2) { if (dbh.nLastFlushed != nUpdateCounter && GetTime() - dbh.nLastWalletUpdate >= 2) {
if (BerkeleyBatch::PeriodicFlush(dbh)) { if (dbh.PeriodicFlush()) {
dbh.nLastFlushed = nUpdateCounter; dbh.nLastFlushed = nUpdateCounter;
} }
} }