foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

net: fMsgProcWake use LOCK instead of lock_guard

Browse source
This commit is contained in:
Anthony Towns 2019-05-30 13:44:02 +10:00
parent de7c5f41ab
commit 8b5af3d4c1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/net.cpp
View file

@ -1454,7 +1454,7 @@ void CConnman::ThreadSocketHandler()
void CConnman::WakeMessageHandler() void CConnman::WakeMessageHandler()
{ {
{ {
std::lock_guard<std::mutex> lock(mutexMsgProc); LOCK(mutexMsgProc);
fMsgProcWake = true; fMsgProcWake = true;
} }
condMsgProc.notify_one(); condMsgProc.notify_one();
@ -2057,7 +2057,7 @@ void CConnman::ThreadMessageHandler()
WAIT_LOCK(mutexMsgProc, lock); WAIT_LOCK(mutexMsgProc, lock);
if (!fMoreWork) { if (!fMoreWork) {
condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100), [this] { return fMsgProcWake; }); condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100), [this]() EXCLUSIVE_LOCKS_REQUIRED(mutexMsgProc) { return fMsgProcWake; });
} }
fMsgProcWake = false; fMsgProcWake = false;
} }
@ -2366,7 +2366,7 @@ static CNetCleanup instance_of_cnetcleanup;
void CConnman::Interrupt() void CConnman::Interrupt()
{ {
{ {
std::lock_guard<std::mutex> lock(mutexMsgProc); LOCK(mutexMsgProc);
flagInterruptMsgProc = true; flagInterruptMsgProc = true;
} }
condMsgProc.notify_all(); condMsgProc.notify_all();

2
src/net.h
View file

@ -451,7 +451,7 @@ private:
const uint64_t nSeed0, nSeed1; const uint64_t nSeed0, nSeed1;
/** flag for waking the message processor. */ /** flag for waking the message processor. */
bool fMsgProcWake; bool fMsgProcWake GUARDED_BY(mutexMsgProc);
std::condition_variable condMsgProc; std::condition_variable condMsgProc;
Mutex mutexMsgProc; Mutex mutexMsgProc;