scheduler: Use C++11 member initialization, add shutdown assert

MarcoFalke · MarcoFalke · commit fa70ccc6c4e3 · 2020-03-07T08:58:38.000-05:00
"Initializing the members in the declaration makes it easy to spot uninitialized ones". https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#c-data-structures
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -9,13 +9,14 @@
 #include <assert.h>
 #include <utility>
 
-CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false)
+CScheduler::CScheduler()
 {
 }
 
 CScheduler::~CScheduler()
 {
     assert(nThreadsServicingQueue == 0);
+    if (stopWhenEmpty) assert(taskQueue.empty());
 }
 
 
diff --git a/src/scheduler.h b/src/scheduler.h
@@ -86,9 +86,9 @@ class CScheduler
     mutable Mutex newTaskMutex;
     std::condition_variable newTaskScheduled;
     std::multimap<std::chrono::system_clock::time_point, Function> taskQueue GUARDED_BY(newTaskMutex);
-    int nThreadsServicingQueue GUARDED_BY(newTaskMutex);
-    bool stopRequested GUARDED_BY(newTaskMutex);
-    bool stopWhenEmpty GUARDED_BY(newTaskMutex);
+    int nThreadsServicingQueue GUARDED_BY(newTaskMutex){0};
+    bool stopRequested GUARDED_BY(newTaskMutex){false};
+    bool stopWhenEmpty GUARDED_BY(newTaskMutex){false};
     bool shouldStop() const EXCLUSIVE_LOCKS_REQUIRED(newTaskMutex) { return stopRequested || (stopWhenEmpty && taskQueue.empty()); }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@`
`9`	`9`	`#include <assert.h>`
`10`	`10`	`#include <utility>`
`11`	`11`
`12`		`-CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false)`
	`12`	`+CScheduler::CScheduler()`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`CScheduler::~CScheduler()`
`17`	`17`	`{`
`18`	`18`	`assert(nThreadsServicingQueue == 0);`
	`19`	`+ if (stopWhenEmpty) assert(taskQueue.empty());`
`19`	`20`	`}`
`20`	`21`
`21`	`22`