Merge #9679: Access WorkQueue::running only within the cs lock

laanwj · laanwj · commit a3511628d097 · 2017-02-04T11:37:26.000+01:00
7b2d96b Access WorkQueue::running only within the cs lock. (Matt Corallo)
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -118,7 +118,7 @@ class WorkQueue
     void Run()
     {
         ThreadCounter count(*this);
-        while (running) {
+        while (true) {
             std::unique_ptr<WorkItem> i;
             {
                 std::unique_lock<std::mutex> lock(cs);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class WorkQueue`
`118`	`118`	`void Run()`
`119`	`119`	`{`
`120`	`120`	`ThreadCounter count(*this);`
`121`		`- while (running) {`
	`121`	`+ while (true) {`
`122`	`122`	`std::unique_ptr<WorkItem> i;`
`123`	`123`	`{`
`124`	`124`	`std::unique_lock<std::mutex> lock(cs);`