Skip to content

Commit 3aa2581

Browse files
committed
scripted-diff: rename m_cs_callbacks_pending -> m_callbacks_mutex
-BEGIN VERIFY SCRIPT- sed -i 's/m_cs_callbacks_pending/m_callbacks_mutex/g' ./src/scheduler.h ./src/scheduler.cpp -END VERIFY SCRIPT
1 parent 807169e commit 3aa2581

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/scheduler.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ bool CScheduler::AreThreadsServicingQueue() const
136136
void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue()
137137
{
138138
{
139-
LOCK(m_cs_callbacks_pending);
139+
LOCK(m_callbacks_mutex);
140140
// Try to avoid scheduling too many copies here, but if we
141141
// accidentally have two ProcessQueue's scheduled at once its
142142
// not a big deal.
@@ -150,7 +150,7 @@ void SingleThreadedSchedulerClient::ProcessQueue()
150150
{
151151
std::function<void()> callback;
152152
{
153-
LOCK(m_cs_callbacks_pending);
153+
LOCK(m_callbacks_mutex);
154154
if (m_are_callbacks_running) return;
155155
if (m_callbacks_pending.empty()) return;
156156
m_are_callbacks_running = true;
@@ -167,7 +167,7 @@ void SingleThreadedSchedulerClient::ProcessQueue()
167167
~RAIICallbacksRunning()
168168
{
169169
{
170-
LOCK(instance->m_cs_callbacks_pending);
170+
LOCK(instance->m_callbacks_mutex);
171171
instance->m_are_callbacks_running = false;
172172
}
173173
instance->MaybeScheduleProcessQueue();
@@ -182,7 +182,7 @@ void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void()> func
182182
assert(m_pscheduler);
183183

184184
{
185-
LOCK(m_cs_callbacks_pending);
185+
LOCK(m_callbacks_mutex);
186186
m_callbacks_pending.emplace_back(std::move(func));
187187
}
188188
MaybeScheduleProcessQueue();
@@ -194,13 +194,13 @@ void SingleThreadedSchedulerClient::EmptyQueue()
194194
bool should_continue = true;
195195
while (should_continue) {
196196
ProcessQueue();
197-
LOCK(m_cs_callbacks_pending);
197+
LOCK(m_callbacks_mutex);
198198
should_continue = !m_callbacks_pending.empty();
199199
}
200200
}
201201

202202
size_t SingleThreadedSchedulerClient::CallbacksPending()
203203
{
204-
LOCK(m_cs_callbacks_pending);
204+
LOCK(m_callbacks_mutex);
205205
return m_callbacks_pending.size();
206206
}

src/scheduler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ class SingleThreadedSchedulerClient
119119
private:
120120
CScheduler* m_pscheduler;
121121

122-
RecursiveMutex m_cs_callbacks_pending;
123-
std::list<std::function<void()>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending);
124-
bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false;
122+
RecursiveMutex m_callbacks_mutex;
123+
std::list<std::function<void()>> m_callbacks_pending GUARDED_BY(m_callbacks_mutex);
124+
bool m_are_callbacks_running GUARDED_BY(m_callbacks_mutex) = false;
125125

126126
void MaybeScheduleProcessQueue();
127127
void ProcessQueue();

0 commit comments

Comments
 (0)