Wallet: Let the interval-flushing thread figure out the filename

luke-jr · luke-jr · commit fb0c934d1b2d · 2016-11-11T11:35:49.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3549,14 +3549,18 @@ bool CWallet::InitLoadWallet()
     return true;
 }
 
+std::atomic<bool> CWallet::fFlushThreadRunning(false);
+
 void CWallet::postInitProcess(boost::thread_group& threadGroup)
 {
     // Add wallet transactions that aren't already in a block to mempool
     // Do this here as mempool requires genesis block to be loaded
     ReacceptWalletTransactions();
 
     // Run a thread to flush wallet periodically
-    threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(this->strWalletFile)));
+    if (!CWallet::fFlushThreadRunning.exchange(true)) {
+        threadGroup.create_thread(ThreadFlushWalletDB);
+    }
 }
 
 bool CWallet::ParameterInteraction()
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -18,6 +18,7 @@
 #include "wallet/rpcwallet.h"
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <set>
 #include <stdexcept>
@@ -550,6 +551,8 @@ class CAccountingEntry
 class CWallet : public CCryptoKeyStore, public CValidationInterface
 {
 private:
+    static std::atomic<bool> fFlushThreadRunning;
+
     /**
      * Select a set of coins such that nValueRet >= nTargetValue and at least
      * all coins from coinControl are selected; Never select unconfirmed coins
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -768,7 +768,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx)
     return DB_LOAD_OK;
 }
 
-void ThreadFlushWalletDB(const string& strFile)
+void ThreadFlushWalletDB()
 {
     // Make this thread recognisable as the wallet flushing thread
     RenameThread("bitcoin-wallet");
@@ -810,6 +810,7 @@ void ThreadFlushWalletDB(const string& strFile)
                 if (nRefCount == 0)
                 {
                     boost::this_thread::interruption_point();
+                    const std::string& strFile = pwalletMain->strWalletFile;
                     map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
                     if (_mi != bitdb.mapFileUseCount.end())
                     {
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -182,6 +182,6 @@ class CWalletDB : public CDB
 
 };
 
-void ThreadFlushWalletDB(const std::string& strFile);
+void ThreadFlushWalletDB();
 
 #endif // BITCOIN_WALLET_WALLETDB_H

Original file line number	Diff line number	Diff line change
`@@ -3549,14 +3549,18 @@ bool CWallet::InitLoadWallet()`
`3549`	`3549`	`return true;`
`3550`	`3550`	`}`
`3551`	`3551`
	`3552`	`+std::atomic<bool> CWallet::fFlushThreadRunning(false);`
	`3553`	`+`
`3552`	`3554`	`void CWallet::postInitProcess(boost::thread_group& threadGroup)`
`3553`	`3555`	`{`
`3554`	`3556`	`// Add wallet transactions that aren't already in a block to mempool`
`3555`	`3557`	`// Do this here as mempool requires genesis block to be loaded`
`3556`	`3558`	`ReacceptWalletTransactions();`
`3557`	`3559`
`3558`	`3560`	`// Run a thread to flush wallet periodically`
`3559`		`- threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(this->strWalletFile)));`
	`3561`	`+ if (!CWallet::fFlushThreadRunning.exchange(true)) {`
	`3562`	`+ threadGroup.create_thread(ThreadFlushWalletDB);`
	`3563`	`+ }`
`3560`	`3564`	`}`
`3561`	`3565`
`3562`	`3566`	`bool CWallet::ParameterInteraction()`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx)`
`768`	`768`	`return DB_LOAD_OK;`
`769`	`769`	`}`
`770`	`770`
`771`		`-void ThreadFlushWalletDB(const string& strFile)`
	`771`	`+void ThreadFlushWalletDB()`
`772`	`772`	`{`
`773`	`773`	`// Make this thread recognisable as the wallet flushing thread`
`774`	`774`	`RenameThread("bitcoin-wallet");`
`@@ -810,6 +810,7 @@ void ThreadFlushWalletDB(const string& strFile)`
`810`	`810`	`if (nRefCount == 0)`
`811`	`811`	`{`
`812`	`812`	`boost::this_thread::interruption_point();`
	`813`	`+ const std::string& strFile = pwalletMain->strWalletFile;`
`813`	`814`	`map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);`
`814`	`815`	`if (_mi != bitdb.mapFileUseCount.end())`
`815`	`816`	`{`