Skip to content

Commit fa8337f

Browse files
author
MarcoFalke
committed
clang-format scheduler
Can easily be reviewed with the git options --ignore-all-space --word-diff-regex=. -U0
1 parent fa3d41b commit fa8337f

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

src/scheduler.cpp

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ void CScheduler::scheduleEvery(CScheduler::Function f, std::chrono::milliseconds
110110
scheduleFromNow([=] { Repeat(*this, f, delta); }, delta);
111111
}
112112

113-
size_t CScheduler::getQueueInfo(std::chrono::system_clock::time_point &first,
114-
std::chrono::system_clock::time_point &last) const
113+
size_t CScheduler::getQueueInfo(std::chrono::system_clock::time_point& first,
114+
std::chrono::system_clock::time_point& last) const
115115
{
116116
LOCK(newTaskMutex);
117117
size_t result = taskQueue.size();
@@ -122,13 +122,15 @@ size_t CScheduler::getQueueInfo(std::chrono::system_clock::time_point &first,
122122
return result;
123123
}
124124

125-
bool CScheduler::AreThreadsServicingQueue() const {
125+
bool CScheduler::AreThreadsServicingQueue() const
126+
{
126127
LOCK(newTaskMutex);
127128
return nThreadsServicingQueue;
128129
}
129130

130131

131-
void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue() {
132+
void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue()
133+
{
132134
{
133135
LOCK(m_cs_callbacks_pending);
134136
// Try to avoid scheduling too many copies here, but if we
@@ -140,8 +142,9 @@ void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue() {
140142
m_pscheduler->schedule(std::bind(&SingleThreadedSchedulerClient::ProcessQueue, this), std::chrono::system_clock::now());
141143
}
142144

143-
void SingleThreadedSchedulerClient::ProcessQueue() {
144-
std::function<void ()> callback;
145+
void SingleThreadedSchedulerClient::ProcessQueue()
146+
{
147+
std::function<void()> callback;
145148
{
146149
LOCK(m_cs_callbacks_pending);
147150
if (m_are_callbacks_running) return;
@@ -157,7 +160,8 @@ void SingleThreadedSchedulerClient::ProcessQueue() {
157160
struct RAIICallbacksRunning {
158161
SingleThreadedSchedulerClient* instance;
159162
explicit RAIICallbacksRunning(SingleThreadedSchedulerClient* _instance) : instance(_instance) {}
160-
~RAIICallbacksRunning() {
163+
~RAIICallbacksRunning()
164+
{
161165
{
162166
LOCK(instance->m_cs_callbacks_pending);
163167
instance->m_are_callbacks_running = false;
@@ -169,7 +173,8 @@ void SingleThreadedSchedulerClient::ProcessQueue() {
169173
callback();
170174
}
171175

172-
void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void ()> func) {
176+
void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void()> func)
177+
{
173178
assert(m_pscheduler);
174179

175180
{
@@ -179,7 +184,8 @@ void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void ()> fun
179184
MaybeScheduleProcessQueue();
180185
}
181186

182-
void SingleThreadedSchedulerClient::EmptyQueue() {
187+
void SingleThreadedSchedulerClient::EmptyQueue()
188+
{
183189
assert(!m_pscheduler->AreThreadsServicingQueue());
184190
bool should_continue = true;
185191
while (should_continue) {
@@ -189,7 +195,8 @@ void SingleThreadedSchedulerClient::EmptyQueue() {
189195
}
190196
}
191197

192-
size_t SingleThreadedSchedulerClient::CallbacksPending() {
198+
size_t SingleThreadedSchedulerClient::CallbacksPending()
199+
{
193200
LOCK(m_cs_callbacks_pending);
194201
return m_callbacks_pending.size();
195202
}

src/scheduler.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class CScheduler
8484
* Returns number of tasks waiting to be serviced,
8585
* and first and last task times
8686
*/
87-
size_t getQueueInfo(std::chrono::system_clock::time_point &first,
88-
std::chrono::system_clock::time_point &last) const;
87+
size_t getQueueInfo(std::chrono::system_clock::time_point& first,
88+
std::chrono::system_clock::time_point& last) const;
8989

9090
/** Returns true if there are threads actively running in serviceQueue() */
9191
bool AreThreadsServicingQueue() const;
@@ -110,27 +110,28 @@ class CScheduler
110110
* B() will be able to observe all of the effects of callback A() which executed
111111
* before it.
112112
*/
113-
class SingleThreadedSchedulerClient {
113+
class SingleThreadedSchedulerClient
114+
{
114115
private:
115-
CScheduler *m_pscheduler;
116+
CScheduler* m_pscheduler;
116117

117118
RecursiveMutex m_cs_callbacks_pending;
118-
std::list<std::function<void ()>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending);
119+
std::list<std::function<void()>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending);
119120
bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false;
120121

121122
void MaybeScheduleProcessQueue();
122123
void ProcessQueue();
123124

124125
public:
125-
explicit SingleThreadedSchedulerClient(CScheduler *pschedulerIn) : m_pscheduler(pschedulerIn) {}
126+
explicit SingleThreadedSchedulerClient(CScheduler* pschedulerIn) : m_pscheduler(pschedulerIn) {}
126127

127128
/**
128129
* Add a callback to be executed. Callbacks are executed serially
129130
* and memory is release-acquire consistent between callback executions.
130131
* Practically, this means that callbacks can behave as if they are executed
131132
* in order by a single thread.
132133
*/
133-
void AddToProcessQueue(std::function<void ()> func);
134+
void AddToProcessQueue(std::function<void()> func);
134135

135136
/**
136137
* Processes all remaining queue members on the calling thread, blocking until queue is empty

0 commit comments

Comments
 (0)