[Wallet] refactor CWallet/CWalletDB/CDB (Round 2)

furszy · furszy · commit 58504c2fd182 · 2020-11-11T20:21:24.000-03:00
Focused on the ThreadFlushWalletDB/PeriodicFlush area.

An adapted version of btc@7184e25c80aa8b1629a700bb7a7e290ad0bb2792
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -587,3 +587,38 @@ void CDBEnv::Flush(bool fShutdown)
         }
     }
 }
+
+bool CDB::PeriodicFlush(const std::string& strFile)
+{
+    bool ret = false;
+    TRY_LOCK(bitdb.cs_db, lockDb);
+    if (lockDb) {
+        // Don't do this if any databases are in use
+        int nRefCount = 0;
+        std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.begin();
+        while (mi != bitdb.mapFileUseCount.end()) {
+            nRefCount += (*mi).second;
+            mi++;
+        }
+
+        if (nRefCount == 0) {
+            boost::this_thread::interruption_point();
+            std::map<std::string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
+            if (_mi != bitdb.mapFileUseCount.end()) {
+                LogPrint(BCLog::DB, "Flushing %s\n", strFile);
+                int64_t nStart = GetTimeMillis();
+
+                // Flush wallet file so it's self contained
+                bitdb.CloseDb(strFile);
+                bitdb.CheckpointLSN(strFile);
+
+                bitdb.mapFileUseCount.erase(_mi++);
+                LogPrint(BCLog::DB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
+                ret = true;
+            }
+        }
+    }
+
+    return ret;
+}
+
diff --git a/src/wallet/db.h b/src/wallet/db.h
@@ -110,8 +110,7 @@ class CDB
 
     /* flush the wallet passively (TRY_LOCK)
        ideal to be called periodically */
-    // TODO: Back port Periodic flush..
-    //static bool PeriodicFlush(std::string strFile);
+    static bool PeriodicFlush(const std::string& strFile);
     /* verifies the database environment */
     static bool VerifyEnvironment(const std::string& walletFile, const fs::path& dataDir, std::string& errorStr);
     /* verifies the database file */
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -903,34 +903,9 @@ void ThreadFlushWalletDB()
         }
 
         if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2) {
-            TRY_LOCK(bitdb.cs_db, lockDb);
-            if (lockDb) {
-                // Don't do this if any databases are in use
-                int nRefCount = 0;
-                std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.begin();
-                while (mi != bitdb.mapFileUseCount.end()) {
-                    nRefCount += (*mi).second;
-                    mi++;
-                }
-
-                if (nRefCount == 0) {
-                    boost::this_thread::interruption_point();
-                    const std::string& strFile = pwalletMain->strWalletFile;
-                    std::map<std::string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
-                    if (_mi != bitdb.mapFileUseCount.end()) {
-                        LogPrint(BCLog::DB, "Flushing %s\n", strFile);
-                        nLastFlushed = CWalletDB::GetUpdateCounter();
-                        int64_t nStart = GetTimeMillis();
-
-                        // Flush wallet file so it's self contained
-                        bitdb.CloseDb(strFile);
-                        bitdb.CheckpointLSN(strFile);
-
-                        bitdb.mapFileUseCount.erase(_mi++);
-                        LogPrint(BCLog::DB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
-                    }
-                }
-            }
+            const std::string& strFile = pwalletMain->strWalletFile;
+            if (CDB::PeriodicFlush(strFile))
+                nLastFlushed = CWalletDB::GetUpdateCounter();
         }
     }
 }
