Merge d2f6d2976f into merged_master (Bitcoin PR bitcoin/bitcoin#21895)

This commit is contained in:
Andrew Poelstra 2021-07-09 01:13:11 +00:00
commit 56c25e5ac7

View file

@ -63,12 +63,11 @@ template <typename WorkItem>
class WorkQueue
{
private:
/** Mutex protects entire object */
Mutex cs;
std::condition_variable cond;
std::deque<std::unique_ptr<WorkItem>> queue;
bool running;
size_t maxDepth;
std::condition_variable cond GUARDED_BY(cs);
std::deque<std::unique_ptr<WorkItem>> queue GUARDED_BY(cs);
bool running GUARDED_BY(cs);
const size_t maxDepth;
public:
explicit WorkQueue(size_t _maxDepth) : running(true),