mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

bugfix: Mark m_tip_block_cv as guarded by m_tip_block_mutex

Browse source 
This is not strictly required, but all places using m_tip_block_cv
(except shutdown) already take the lock. The annotation makes it easier
to catch potential deadlocks before review.

Adding the missing lock to the shutdown sequence is a bugfix.

An alternative would be to take the lock and release it before
notifying, see
https://github.com/bitcoin/bitcoin/pull/30967#discussion_r1778899716
This commit is contained in:
MarcoFalke 2024-09-30 11:53:05 +02:00
parent fa18586c29
commit fad8e7fba7
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/kernel_notifications.h
View file

@ -58,7 +58,7 @@ public:
bool m_shutdown_on_fatal_error{true}; bool m_shutdown_on_fatal_error{true};
Mutex m_tip_block_mutex; Mutex m_tip_block_mutex;
std::condition_variable m_tip_block_cv; std::condition_variable m_tip_block_cv GUARDED_BY(m_tip_block_mutex);
//! The block for which the last blockTip notification was received for. //! The block for which the last blockTip notification was received for.
uint256 m_tip_block GUARDED_BY(m_tip_block_mutex); uint256 m_tip_block GUARDED_BY(m_tip_block_mutex);

2
src/rpc/server.cpp
View file

@ -305,7 +305,7 @@ void StopRPC(const std::any& context)
DeleteAuthCookie(); DeleteAuthCookie();
node::NodeContext& node = EnsureAnyNodeContext(context); node::NodeContext& node = EnsureAnyNodeContext(context);
// The notifications interface doesn't exist between initialization step 4a and 7. // The notifications interface doesn't exist between initialization step 4a and 7.
if (node.notifications) node.notifications->m_tip_block_cv.notify_all(); if (node.notifications) WITH_LOCK(node.notifications->m_tip_block_mutex, node.notifications->m_tip_block_cv.notify_all());
LogDebug(BCLog::RPC, "RPC stopped.\n"); LogDebug(BCLog::RPC, "RPC stopped.\n");
}); });
} }