averello/bitcoin-mirror
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-13 20:36:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

validation: use a lock for CCheckQueueControl

Browse Source 
Uses an RAII lock for the exact same behavior as the old critical sections.

Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
This commit is contained in:
Cory Fields
2025-05-09 17:31:37 +00:00
parent c3b0e6c7f4
commit 1a37507895
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/checkqueue.h
View File

@@ -205,20 +205,18 @@ public:
* queue is finished before continuing.
*/
template <typename T, typename R = std::remove_cvref_t<decltype(std::declval<T>()().value())>>
class CCheckQueueControl
class SCOPED_LOCKABLE CCheckQueueControl
{
private:
CCheckQueue<T, R>& m_queue;
UniqueLock<Mutex> m_lock;
bool fDone;
public:
CCheckQueueControl() = delete;
CCheckQueueControl(const CCheckQueueControl&) = delete;
CCheckQueueControl& operator=(const CCheckQueueControl&) = delete;
explicit CCheckQueueControl(CCheckQueue<T>& queueIn) : m_queue(queueIn), fDone(false)
{
ENTER_CRITICAL_SECTION(m_queue.m_control_mutex);
}
explicit CCheckQueueControl(CCheckQueue<T>& queueIn) EXCLUSIVE_LOCK_FUNCTION(queueIn.m_control_mutex) : m_queue(queueIn), m_lock(LOCK_ARGS(queueIn.m_control_mutex)), fDone(false) {}
std::optional<R> Complete()
{
@@ -232,11 +230,10 @@ public:
m_queue.Add(std::move(vChecks));
}
~CCheckQueueControl()
~CCheckQueueControl() UNLOCK_FUNCTION()
{
if (!fDone)
Complete();
LEAVE_CRITICAL_SECTION(m_queue.m_control_mutex);
}
};