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

refactor: clean up PeriodicFlush()

Browse Source
This commit is contained in:
John Newbery 2020-05-27 16:15:50 -04:00
parent f7c19e829e
commit e846a2a1d9
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/wallet/bdb.cpp
View File

@ -615,42 +615,33 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
bool BerkeleyDatabase::PeriodicFlush() bool BerkeleyDatabase::PeriodicFlush()
{ {
if (IsDummy()) { // There's nothing to do for dummy databases. Return true.
return true; if (IsDummy()) return true;
}
bool ret = false; // Don't flush if we can't acquire the lock.
TRY_LOCK(cs_db, lockDb); TRY_LOCK(cs_db, lockDb);
if (lockDb) if (!lockDb) return false;
{
// Don't do this if any databases are in use
int nRefCount = 0;
std::map<std::string, int>::iterator mit = env->mapFileUseCount.begin();
while (mit != env->mapFileUseCount.end())
{
nRefCount += (*mit).second;
mit++;
}
if (nRefCount == 0) // Don't flush if any databases are in use
{ for (auto it = env->mapFileUseCount.begin() ; it != env->mapFileUseCount.end(); it++) {
std::map<std::string, int>::iterator mi = env->mapFileUseCount.find(strFile); if ((*it).second > 0) return false;
if (mi != env->mapFileUseCount.end())
{
LogPrint(BCLog::WALLETDB, "Flushing %s\n", strFile);
int64_t nStart = GetTimeMillis();
// Flush wallet file so it's self contained
env->CloseDb(strFile);
env->CheckpointLSN(strFile);
env->mapFileUseCount.erase(mi++);
LogPrint(BCLog::WALLETDB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
ret = true;
}
}
} }
return ret; // Don't flush if there haven't been any batch writes for this database.
auto it = env->mapFileUseCount.find(strFile);
if (it == env->mapFileUseCount.end()) return false;
LogPrint(BCLog::WALLETDB, "Flushing %s\n", strFile);
int64_t nStart = GetTimeMillis();
// Flush wallet file so it's self contained
env->CloseDb(strFile);
env->CheckpointLSN(strFile);
env->mapFileUseCount.erase(it);
LogPrint(BCLog::WALLETDB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
return true;
} }
bool BerkeleyDatabase::Backup(const std::string& strDest) const bool BerkeleyDatabase::Backup(const std::string& strDest) const