phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 11:13:23 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripted-diff: rename m_cs_callbacks_pending -> m_callbacks_mutex

Browse source 
-BEGIN VERIFY SCRIPT-
sed -i 's/m_cs_callbacks_pending/m_callbacks_mutex/g' ./src/scheduler.h ./src/scheduler.cpp
-END VERIFY SCRIPT
This commit is contained in:
Sebastian Falbesoner 2022-01-14 13:25:23 +01:00
parent 807169e10b
commit 3aa258109e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/scheduler.cpp
View file

@ -136,7 +136,7 @@ bool CScheduler::AreThreadsServicingQueue() const
void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue() void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue()
{ {
{ {
LOCK(m_cs_callbacks_pending); LOCK(m_callbacks_mutex);
// Try to avoid scheduling too many copies here, but if we // Try to avoid scheduling too many copies here, but if we
// accidentally have two ProcessQueue's scheduled at once its // accidentally have two ProcessQueue's scheduled at once its
// not a big deal. // not a big deal.
@ -150,7 +150,7 @@ void SingleThreadedSchedulerClient::ProcessQueue()
{ {
std::function<void()> callback; std::function<void()> callback;
{ {
LOCK(m_cs_callbacks_pending); LOCK(m_callbacks_mutex);
if (m_are_callbacks_running) return; if (m_are_callbacks_running) return;
if (m_callbacks_pending.empty()) return; if (m_callbacks_pending.empty()) return;
m_are_callbacks_running = true; m_are_callbacks_running = true;
@ -167,7 +167,7 @@ void SingleThreadedSchedulerClient::ProcessQueue()
~RAIICallbacksRunning() ~RAIICallbacksRunning()
{ {
{ {
LOCK(instance->m_cs_callbacks_pending); LOCK(instance->m_callbacks_mutex);
instance->m_are_callbacks_running = false; instance->m_are_callbacks_running = false;
} }
instance->MaybeScheduleProcessQueue(); instance->MaybeScheduleProcessQueue();
@ -182,7 +182,7 @@ void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void()> func
assert(m_pscheduler); assert(m_pscheduler);
{ {
LOCK(m_cs_callbacks_pending); LOCK(m_callbacks_mutex);
m_callbacks_pending.emplace_back(std::move(func)); m_callbacks_pending.emplace_back(std::move(func));
} }
MaybeScheduleProcessQueue(); MaybeScheduleProcessQueue();
@ -194,13 +194,13 @@ void SingleThreadedSchedulerClient::EmptyQueue()
bool should_continue = true; bool should_continue = true;
while (should_continue) { while (should_continue) {
ProcessQueue(); ProcessQueue();
LOCK(m_cs_callbacks_pending); LOCK(m_callbacks_mutex);
should_continue = !m_callbacks_pending.empty(); should_continue = !m_callbacks_pending.empty();
} }
} }
size_t SingleThreadedSchedulerClient::CallbacksPending() size_t SingleThreadedSchedulerClient::CallbacksPending()
{ {
LOCK(m_cs_callbacks_pending); LOCK(m_callbacks_mutex);
return m_callbacks_pending.size(); return m_callbacks_pending.size();
} }

6
src/scheduler.h
View file

@ -119,9 +119,9 @@ class SingleThreadedSchedulerClient
private: private:
CScheduler* m_pscheduler; CScheduler* m_pscheduler;
RecursiveMutex m_cs_callbacks_pending; RecursiveMutex m_callbacks_mutex;
std::list<std::function<void()>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending); std::list<std::function<void()>> m_callbacks_pending GUARDED_BY(m_callbacks_mutex);
bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false; bool m_are_callbacks_running GUARDED_BY(m_callbacks_mutex) = false;
void MaybeScheduleProcessQueue(); void MaybeScheduleProcessQueue();
void ProcessQueue(); void ProcessQueue();