Merge pull request #5721

laanwj · laanwj · commit fb6140b54bad · 2015-02-06T16:51:39.000+01:00
cf008ac Acquire CCheckQueue's lock to avoid race condition (Suhas Daftuar)
diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -161,7 +161,12 @@ class CCheckQueue
     {
     }
 
-    friend class CCheckQueueControl<T>;
+    bool IsIdle()
+    {
+        boost::unique_lock<boost::mutex> lock(mutex);
+        return (nTotal == nIdle && nTodo == 0 && fAllOk == true);
+    }
+
 };
 
 /** 
@@ -180,9 +185,8 @@ class CCheckQueueControl
     {
         // passed queue is supposed to be unused, or NULL
         if (pqueue != NULL) {
-            assert(pqueue->nTotal == pqueue->nIdle);
-            assert(pqueue->nTodo == 0);
-            assert(pqueue->fAllOk == true);
+            bool isIdle = pqueue->IsIdle();
+            assert(isIdle);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,12 @@ class CCheckQueue`
`161`	`161`	`{`
`162`	`162`	`}`
`163`	`163`
`164`		`- friend class CCheckQueueControl<T>;`
	`164`	`+ bool IsIdle()`
	`165`	`+ {`
	`166`	`+ boost::unique_lock<boost::mutex> lock(mutex);`
	`167`	`+ return (nTotal == nIdle && nTodo == 0 && fAllOk == true);`
	`168`	`+ }`
	`169`	`+`
`165`	`170`	`};`
`166`	`171`
`167`	`172`	`/**`
`@@ -180,9 +185,8 @@ class CCheckQueueControl`
`180`	`185`	`{`
`181`	`186`	`// passed queue is supposed to be unused, or NULL`
`182`	`187`	`if (pqueue != NULL) {`
`183`		`- assert(pqueue->nTotal == pqueue->nIdle);`
`184`		`- assert(pqueue->nTodo == 0);`
`185`		`- assert(pqueue->fAllOk == true);`
	`188`	`+ bool isIdle = pqueue->IsIdle();`
	`189`	`+ assert(isIdle);`
`186`	`190`	`}`
`187`	`191`	`}`
`188`	`192`