Skip to content

Commit 04ca600

Browse files
committed
MB-36956: Allow multiple ExecutorPool backends
To facilitate using a Folly executor-based ExecutorPool instead of our Global Executor added in Couchbase 3.0, rename the existing ExecutorPool class to 'CB3ExecutorPool', ExecutorThread to CB3ExecutorThread, and make ExecutorPool a pure virtual interface. Currently this still creates exactly the same CB3-style ExecutorPool, it just adds an indirection to permit other implementations in future. Change-Id: Iaded9719a832e529147c2e5a61f72095e6f8360b Reviewed-on: http://review.couchbase.org/c/kv_engine/+/130418 Tested-by: Build Bot <[email protected]> Reviewed-by: Jim Walker <[email protected]>
1 parent bff1cce commit 04ca600

15 files changed

+421
-269
lines changed

engines/ep/benchmarks/executor_bench.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <folly/executors/CPUThreadPoolExecutor.h>
2929
#include <folly/executors/IOThreadPoolExecutor.h>
3030
#include <folly/futures/Future.h>
31+
#include <relaxed_atomic.h>
3132
#include <random>
3233

3334
/**
@@ -40,7 +41,6 @@ class ExecutorBench : public benchmark::Fixture {
4041
// ExecutorPool cannot handle having a count of zero :(
4142
pool = std::make_unique<TestExecutorPool>(
4243
nonIOCount,
43-
NUM_TASK_GROUPS,
4444
ThreadPoolConfig::ThreadCount(1),
4545
ThreadPoolConfig::ThreadCount(1),
4646
1,

0 commit comments

Comments
 (0)