diff options
| author | Anthony Towns <[email protected]> | 2019-05-30 14:02:41 +1000 |
|---|---|---|
| committer | Anthony Towns <[email protected]> | 2020-05-19 16:33:02 +1000 |
| commit | de7c5f41aba860751ef7824245e6d9d5088a1200 (patch) | |
| tree | fbf12cfa5fe55d0f21dcaf57e7b510327b1ab296 /src | |
| parent | rpc/blockchain.cpp: Remove g_utxosetscan mutex that is only protecting a sing... (diff) | |
| download | discoin-de7c5f41aba860751ef7824245e6d9d5088a1200.tar.xz discoin-de7c5f41aba860751ef7824245e6d9d5088a1200.zip | |
wallet/wallet.h: Remove mutexScanning which was only protecting a single atomic bool
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 8f624c25d..a4cb8253d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -631,7 +631,6 @@ private: std::atomic<bool> fScanningWallet{false}; // controlled by WalletRescanReserver std::atomic<int64_t> m_scanning_start{0}; std::atomic<double> m_scanning_progress{0}; - std::mutex mutexScanning; friend class WalletRescanReserver; //! the current wallet version: clients below this version are not able to load the wallet @@ -1286,13 +1285,11 @@ public: bool reserve() { assert(!m_could_reserve); - std::lock_guard<std::mutex> lock(m_wallet.mutexScanning); - if (m_wallet.fScanningWallet) { + if (m_wallet.fScanningWallet.exchange(true)) { return false; } m_wallet.m_scanning_start = GetTimeMillis(); m_wallet.m_scanning_progress = 0; - m_wallet.fScanningWallet = true; m_could_reserve = true; return true; } @@ -1304,7 +1301,6 @@ public: ~WalletRescanReserver() { - std::lock_guard<std::mutex> lock(m_wallet.mutexScanning); if (m_could_reserve) { m_wallet.fScanningWallet = false; } |