bench: Use CCheckQueue local thread pool

hebasto · hebasto · commit 6784ac471bb3 · 2020-09-24T06:55:34.000+03:00
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
@@ -10,8 +10,6 @@
 #include <random.h>
 #include <util/system.h>
 
-#include <boost/thread/thread.hpp>
-
 #include <vector>
 
 static const size_t BATCHES = 101;
@@ -44,12 +42,9 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
         void swap(PrevectorJob& x){p.swap(x.p);};
     };
     CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE};
-    boost::thread_group tg;
     // The main thread should be counted to prevent thread oversubscription, and
     // to decrease the variance of benchmark results.
-    for (auto x = 0; x < GetNumCores() - 1; ++x) {
-       tg.create_thread([&]{queue.Thread();});
-    }
+    queue.StartWorkerThreads(GetNumCores() - 1);
 
     // create all the data once, then submit copies in the benchmark.
     FastRandomContext insecure_rand(true);
@@ -70,8 +65,7 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
         // it is done explicitly here for clarity
         control.Wait();
     });
-    tg.interrupt_all();
-    tg.join_all();
+    queue.StopWorkerThreads();
     ECC_Stop();
 }
 BENCHMARK(CCheckQueueSpeedPrevectorJob);
diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -159,12 +159,6 @@ class CCheckQueue
         }
     }
 
-    //! Worker thread
-    void Thread()
-    {
-        Loop(false /* worker thread */);
-    }
-
     //! Wait until execution finishes, and return whether all evaluations were successful.
     bool Wait()
     {

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,6 @@ class CCheckQueue`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- //! Worker thread`
`163`		`- void Thread()`
`164`		`- {`
`165`		`- Loop(false /* worker thread */);`
`166`		`- }`
`167`		`-`
`168`	`162`	`//! Wait until execution finishes, and return whether all evaluations were successful.`
`169`	`163`	`bool Wait()`
`170`	`164`	`{`