Let CPUThreadPoolExecutor use unbounded queues

Summary: [Folly] Let CPUThreadPoolExecutor use unbounded queues when no queue bounds are specified. One constructor remains which specifies queue bounds; that constructor uses bounded queues. Reviewed By: andriigrynenko Differential Revision: D15113118 fbshipit-source-id: 9c8ace4f170fdfdeef152e55b371d434ad248866
feng-y · May 10, 2019 · 9a096e5 · 9a096e5
1 parent 82a5342
commit 9a096e5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/folly/executors/CPUThreadPoolExecutor.cpp b/folly/executors/CPUThreadPoolExecutor.cpp
@@ -17,6 +17,8 @@
 #include <folly/executors/CPUThreadPoolExecutor.h>
 
 #include <folly/executors/task_queue/PriorityLifoSemMPMCQueue.h>
+#include <folly/executors/task_queue/PriorityUnboundedBlockingQueue.h>
+#include <folly/executors/task_queue/UnboundedBlockingQueue.h>
 #include <folly/portability/GFlags.h>
 
 DEFINE_bool(
@@ -57,17 +59,15 @@ CPUThreadPoolExecutor::CPUThreadPoolExecutor(
     std::shared_ptr<ThreadFactory> threadFactory)
     : CPUThreadPoolExecutor(
           numThreads,
-          std::make_unique<LifoSemMPMCQueue<CPUTask>>(
-              CPUThreadPoolExecutor::kDefaultMaxQueueSize),
+          std::make_unique<UnboundedBlockingQueue<CPUTask>>(),
           std::move(threadFactory)) {}
 
 CPUThreadPoolExecutor::CPUThreadPoolExecutor(
     std::pair<size_t, size_t> numThreads,
     std::shared_ptr<ThreadFactory> threadFactory)
     : CPUThreadPoolExecutor(
           numThreads,
-          std::make_unique<LifoSemMPMCQueue<CPUTask>>(
-              CPUThreadPoolExecutor::kDefaultMaxQueueSize),
+          std::make_unique<UnboundedBlockingQueue<CPUTask>>(),
           std::move(threadFactory)) {}
 
 CPUThreadPoolExecutor::CPUThreadPoolExecutor(size_t numThreads)
@@ -81,9 +81,8 @@ CPUThreadPoolExecutor::CPUThreadPoolExecutor(
     std::shared_ptr<ThreadFactory> threadFactory)
     : CPUThreadPoolExecutor(
           numThreads,
-          std::make_unique<PriorityLifoSemMPMCQueue<CPUTask>>(
-              numPriorities,
-              CPUThreadPoolExecutor::kDefaultMaxQueueSize),
+          std::make_unique<PriorityUnboundedBlockingQueue<CPUTask>>(
+              numPriorities),
           std::move(threadFactory)) {}
 
 CPUThreadPoolExecutor::CPUThreadPoolExecutor(