Use CScheduler for wallet flushing, remove ThreadFlushWalletDB

TheBlueMatt · furszy · commit 00f36ea5e1d8 · 2021-01-25T08:54:37.000-03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1908,7 +1908,7 @@ bool AppInitMain()
 
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
-        pwalletMain->postInitProcess(threadGroup);
+        pwalletMain->postInitProcess(scheduler);
 
         // StakeMiner thread disabled by default on regtest
         if (gArgs.GetBoolArg("-staking", !Params().IsRegTestNet() && DEFAULT_STAKING)) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -15,6 +15,7 @@
 #include "policy/policy.h"
 #include "sapling/key_io_sapling.h"
 #include "script/sign.h"
+#include "scheduler.h"
 #include "spork.h"
 #include "util.h"
 #include "utilmoneystr.h"
@@ -4128,16 +4129,16 @@ bool CWallet::InitLoadWallet()
     return true;
 }
 
-std::atomic<bool> CWallet::fFlushThreadRunning(false);
+std::atomic<bool> CWallet::fFlushScheduled(false);
 
-void CWallet::postInitProcess(boost::thread_group& threadGroup)
+void CWallet::postInitProcess(CScheduler& scheduler)
 {
     // Add wallet transactions that aren't already in a block to mapTransactions
     ReacceptWalletTransactions(/*fFirstLoad*/true);
 
     // Run a thread to flush wallet periodically
-    if (!CWallet::fFlushThreadRunning.exchange(true)) {
-        threadGroup.create_thread(ThreadFlushWalletDB);
+    if (!CWallet::fFlushScheduled.exchange(true)) {
+        scheduler.scheduleEvery(MaybeFlushWalletDB, 500);
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -44,8 +44,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/thread/thread.hpp>
-
 extern CWallet* pwalletMain;
 
 /**
@@ -94,6 +92,7 @@ class COutput;
 class CStakeableOutput;
 class CReserveKey;
 class CScript;
+class CScheduler;
 class CWalletTx;
 class ScriptPubKeyMan;
 class SaplingScriptPubKeyMan;
@@ -265,7 +264,7 @@ typedef std::map<SaplingOutPoint, SaplingNoteData> mapSaplingNoteData_t;
 class CWallet : public CCryptoKeyStore, public CValidationInterface
 {
 private:
-    static std::atomic<bool> fFlushThreadRunning;
+    static std::atomic<bool> fFlushScheduled;
 
     //! keeps track of whether Unlock has run a thorough check before
     bool fDecryptionThoroughlyChecked{false};
@@ -786,7 +785,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * Wallet post-init setup
      * Gives the wallet a chance to register repetitive tasks and complete post-init tasks
      */
-    void postInitProcess(boost::thread_group& threadGroup);
+    void postInitProcess(CScheduler& scheduler);
 
     /**
      * Address book entry changed.
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -891,35 +891,31 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, std::vector<CWalletTx>& vWtx)
     return DB_LOAD_OK;
 }
 
-void ThreadFlushWalletDB()
+void MaybeFlushWalletDB()
 {
-    // Make this thread recognisable as the wallet flushing thread
-    util::ThreadRename("pivx-wallet");
-
-    static bool fOneThread;
-    if (fOneThread)
+    static std::atomic<bool> fOneThread;
+    if (fOneThread.exchange(true)) {
         return;
-    fOneThread = true;
-    if (!gArgs.GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET))
+    }
+    if (!gArgs.GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) {
         return;
+    }
 
-    unsigned int nLastSeen = CWalletDB::GetUpdateCounter();
-    unsigned int nLastFlushed = CWalletDB::GetUpdateCounter();
-    int64_t nLastWalletUpdate = GetTime();
-    while (true) {
-        MilliSleep(500);
+    static unsigned int nLastSeen = CWalletDB::GetUpdateCounter();
+    static unsigned int nLastFlushed = CWalletDB::GetUpdateCounter();
+    static int64_t nLastWalletUpdate = GetTime();
 
-        if (nLastSeen != CWalletDB::GetUpdateCounter()) {
-            nLastSeen = CWalletDB::GetUpdateCounter();
-            nLastWalletUpdate = GetTime();
-        }
+    if (nLastSeen != CWalletDB::GetUpdateCounter()) {
+        nLastSeen = CWalletDB::GetUpdateCounter();
+        nLastWalletUpdate = GetTime();
+    }
 
-        if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2) {
-            if (CDB::PeriodicFlush(pwalletMain->GetDBHandle())) {
-                nLastFlushed = CWalletDB::GetUpdateCounter();
-            }
+    if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2) {
+        if (CDB::PeriodicFlush(pwalletMain->GetDBHandle())) {
+            nLastFlushed = CWalletDB::GetUpdateCounter();
         }
     }
+    fOneThread = false;
 }
 
 void NotifyBacked(const CWallet& wallet, bool fSuccess, std::string strMessage)
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -230,6 +230,6 @@ void NotifyBacked(const CWallet& wallet, bool fSuccess, std::string strMessage);
 bool BackupWallet(const CWallet& wallet, const fs::path& strDest);
 bool AttemptBackupWallet(const CWallet& wallet, const fs::path& pathSrc, const fs::path& pathDest);
 
-void ThreadFlushWalletDB();
+void MaybeFlushWalletDB();
 
 #endif // BITCOIN_WALLETDB_H

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include "policy/policy.h"`
`16`	`16`	`#include "sapling/key_io_sapling.h"`
`17`	`17`	`#include "script/sign.h"`
	`18`	`+#include "scheduler.h"`
`18`	`19`	`#include "spork.h"`
`19`	`20`	`#include "util.h"`
`20`	`21`	`#include "utilmoneystr.h"`
`@@ -4128,16 +4129,16 @@ bool CWallet::InitLoadWallet()`
`4128`	`4129`	`return true;`
`4129`	`4130`	`}`
`4130`	`4131`
`4131`		`-std::atomic<bool> CWallet::fFlushThreadRunning(false);`
	`4132`	`+std::atomic<bool> CWallet::fFlushScheduled(false);`
`4132`	`4133`
`4133`		`-void CWallet::postInitProcess(boost::thread_group& threadGroup)`
	`4134`	`+void CWallet::postInitProcess(CScheduler& scheduler)`
`4134`	`4135`	`{`
`4135`	`4136`	`// Add wallet transactions that aren't already in a block to mapTransactions`
`4136`	`4137`	`ReacceptWalletTransactions(/fFirstLoad/true);`
`4137`	`4138`
`4138`	`4139`	`// Run a thread to flush wallet periodically`
`4139`		`- if (!CWallet::fFlushThreadRunning.exchange(true)) {`
`4140`		`- threadGroup.create_thread(ThreadFlushWalletDB);`
	`4140`	`+ if (!CWallet::fFlushScheduled.exchange(true)) {`
	`4141`	`+ scheduler.scheduleEvery(MaybeFlushWalletDB, 500);`
`4141`	`4142`	`}`
`4142`	`4143`	`}`
`4143`	`4144`