@@ -136,7 +136,7 @@ bool CScheduler::AreThreadsServicingQueue() const
136136void 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
202202size_t SingleThreadedSchedulerClient::CallbacksPending ()
203203{
204- LOCK (m_cs_callbacks_pending );
204+ LOCK (m_callbacks_mutex );
205205 return m_callbacks_pending.size ();
206206}
0 commit comments