Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 15:32:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpc/blockchain.cpp: Remove g_utxosetscan mutex that is only protecting a single atomic variable

Browse Source
This commit is contained in:
Anthony Towns 2020-02-11 14:54:50 +10:00
parent d96fdc2a39
commit c3cf2f5501
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/blockchain.cpp
View File

@ -1976,7 +1976,6 @@ bool FindScriptPubKey(std::atomic<int>& scan_progress, const std::atomic<bool>&
} }
/** RAII object to prevent concurrency issue when scanning the txout set */ /** RAII object to prevent concurrency issue when scanning the txout set */
static std::mutex g_utxosetscan;
static std::atomic<int> g_scan_progress; static std::atomic<int> g_scan_progress;
static std::atomic<bool> g_scan_in_progress; static std::atomic<bool> g_scan_in_progress;
static std::atomic<bool> g_should_abort_scan; static std::atomic<bool> g_should_abort_scan;
@ -1989,18 +1988,15 @@ public:
bool reserve() { bool reserve() {
CHECK_NONFATAL(!m_could_reserve); CHECK_NONFATAL(!m_could_reserve);
std::lock_guard<std::mutex> lock(g_utxosetscan); if (g_scan_in_progress.exchange(true)) {
if (g_scan_in_progress) {
return false; return false;
} }
g_scan_in_progress = true;
m_could_reserve = true; m_could_reserve = true;
return true; return true;
} }
~CoinsViewScanReserver() { ~CoinsViewScanReserver() {
if (m_could_reserve) { if (m_could_reserve) {
std::lock_guard<std::mutex> lock(g_utxosetscan);
g_scan_in_progress = false; g_scan_in_progress = false;
} }
} }