Accept IOThreadPoolExecutorBase

Summary: Accept the base class instead of IOThreadPoolExecutor so we can experiment with other implementations. Reviewed By: stuclar Differential Revision: D52163795 fbshipit-source-id: b960d44c9bbb9be848dfb975a68e49128a0d51a9
facebook · Dec 19, 2023 · 665e318 · 665e318
1 parent fbe8b8d
commit 665e318
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/mcrouter/CarbonRouterInstance-inl.h b/mcrouter/CarbonRouterInstance-inl.h
@@ -62,7 +62,7 @@ template <class RouterInfo>
 CarbonRouterInstance<RouterInfo>::init(
     folly::StringPiece persistenceId,
     const McrouterOptions& options,
-    std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool) {
+    std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool) {
   if (auto manager = detail::McrouterManager::getSingletonInstance()) {
     return manager->mcrouterGetCreate<RouterInfo>(
         persistenceId, options, ioThreadPool);
@@ -90,7 +90,7 @@ bool CarbonRouterInstance<RouterInfo>::hasInstance(
 template <class RouterInfo>
 CarbonRouterInstance<RouterInfo>* CarbonRouterInstance<RouterInfo>::createRaw(
     McrouterOptions input_options,
-    std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool) {
+    std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool) {
   extraValidateOptions(input_options);
   folly::Executor::KeepAlive<> auxThreadPool;
   if (auto threadPool = AuxiliaryCPUThreadPoolSingleton::try_get()) {
@@ -170,7 +170,7 @@ template <class RouterInfo>
 std::shared_ptr<CarbonRouterInstance<RouterInfo>>
 CarbonRouterInstance<RouterInfo>::create(
     McrouterOptions input_options,
-    std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool) {
+    std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool) {
   return folly::fibers::runInMainContext([&]() mutable {
     return std::shared_ptr<CarbonRouterInstance<RouterInfo>>(
         createRaw(std::move(input_options), std::move(ioThreadPool)),

diff --git a/mcrouter/CarbonRouterInstance.h b/mcrouter/CarbonRouterInstance.h
@@ -79,7 +79,7 @@ class CarbonRouterInstance
   static CarbonRouterInstance<RouterInfo>* init(
       folly::StringPiece persistenceId,
       const McrouterOptions& options,
-      std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool);
+      std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool);
 
   /**
    * If an instance with the given persistenceId already exists,
@@ -106,7 +106,7 @@ class CarbonRouterInstance
    */
   static std::shared_ptr<CarbonRouterInstance<RouterInfo>> create(
       McrouterOptions input_options,
-      std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool = nullptr);
+      std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool = nullptr);
 
   /**
    * Destroys ALL active instances for ALL RouterInfos.
@@ -157,11 +157,11 @@ class CarbonRouterInstance
   }
 
   void setIOThreadPool(
-      std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool) {
+      std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool) {
     proxyThreads_ = std::move(ioThreadPool);
   }
 
-  const folly::IOThreadPoolExecutor& getIOThreadPool() const {
+  const folly::IOThreadPoolExecutorBase& getIOThreadPool() const {
     return *proxyThreads_;
   }
 
@@ -197,7 +197,7 @@ class CarbonRouterInstance
    */
   std::vector<Proxy<RouterInfo>*> proxies_;
   std::vector<std::unique_ptr<folly::VirtualEventBase>> proxyEvbs_;
-  std::shared_ptr<folly::IOThreadPoolExecutor> proxyThreads_;
+  std::shared_ptr<folly::IOThreadPoolExecutorBase> proxyThreads_;
 
   /**
    * Indicates if evbs/IOThreadPoolExecutor has been created by McRouter or
@@ -211,7 +211,7 @@ class CarbonRouterInstance
    */
   static CarbonRouterInstance<RouterInfo>* createRaw(
       McrouterOptions input_options,
-      std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool = nullptr);
+      std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool = nullptr);
 
   explicit CarbonRouterInstance(McrouterOptions input_options);
 

diff --git a/mcrouter/McrouterManager.h b/mcrouter/McrouterManager.h
@@ -34,7 +34,7 @@ class McrouterManager {
   CarbonRouterInstance<RouterInfo>* mcrouterGetCreate(
       folly::StringPiece persistenceId,
       const McrouterOptions& options,
-      std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool = nullptr) {
+      std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool = nullptr) {
     std::shared_ptr<CarbonRouterInstanceBase> mcrouterBase;
 
     {

diff --git a/mcrouter/Server-inl.h b/mcrouter/Server-inl.h
@@ -292,7 +292,7 @@ bool runServerDual(
     const McrouterStandaloneOptions& standaloneOpts,
     StandalonePreRunCb preRunCb) {
   using RequestHandlerType = RequestHandler<ServerOnRequest<RouterInfo>>;
-  std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool;
+  std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool;
   CarbonRouterInstance<RouterInfo>* router;
   std::shared_ptr<AsyncMcServer> asyncMcServer;
   std::shared_ptr<apache::thrift::ThriftServer> thriftServer;
@@ -496,7 +496,7 @@ bool runServer(
   AsyncMcServer::Options opts =
       detail::createAsyncMcServerOptions(mcrouterOpts, standaloneOpts);
 
-  std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool;
+  std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool;
   CarbonRouterInstance<RouterInfo>* router = nullptr;
   std::shared_ptr<AsyncMcServer> asyncMcServer;
   try {

diff --git a/mcrouter/TargetHooks.h b/mcrouter/TargetHooks.h
@@ -19,13 +19,13 @@ namespace mcrouter {
  * SR factory init hook
  */
 FOLLY_ATTR_WEAK std::shared_ptr<void> gSRInitHook(
-    std::shared_ptr<folly::IOThreadPoolExecutor>,
+    std::shared_ptr<folly::IOThreadPoolExecutorBase>,
     const std::string& /* threadPrefix */,
     const McrouterOptions&);
 
 FOLLY_ATTR_WEAK void gAxonInitHook(
     CarbonRouterInstanceBase& router,
-    std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool,
+    std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool,
     const std::string& threadPrefix);
 
 } // namespace mcrouter

diff --git a/mcrouter/lib/AuxiliaryIOThreadPool.cpp b/mcrouter/lib/AuxiliaryIOThreadPool.cpp
@@ -19,7 +19,7 @@ namespace {
 folly::Singleton<AuxiliaryIOThreadPool> gAuxiliaryIOThreadPool;
 } // namespace
 
-folly::IOThreadPoolExecutor& AuxiliaryIOThreadPool::getThreadPool() {
+folly::IOThreadPoolExecutorBase& AuxiliaryIOThreadPool::getThreadPool() {
   folly::call_once(initFlag_, [&] {
     threadPool_ = std::make_unique<folly::IOThreadPoolExecutor>(
         kNumIOThreads,

diff --git a/mcrouter/lib/AuxiliaryIOThreadPool.h b/mcrouter/lib/AuxiliaryIOThreadPool.h
@@ -23,10 +23,10 @@ namespace mcrouter {
  */
 class AuxiliaryIOThreadPool {
  public:
-  folly::IOThreadPoolExecutor& getThreadPool();
+  folly::IOThreadPoolExecutorBase& getThreadPool();
 
  private:
-  std::unique_ptr<folly::IOThreadPoolExecutor> threadPool_;
+  std::unique_ptr<folly::IOThreadPoolExecutorBase> threadPool_;
   folly::once_flag initFlag_;
 };
 

diff --git a/mcrouter/lib/carbon/connection/InternalCarbonConnectionImpl.h b/mcrouter/lib/carbon/connection/InternalCarbonConnectionImpl.h
@@ -23,7 +23,7 @@ struct InternalCarbonConnectionOptions {
   InternalCarbonConnectionOptions() = default;
   size_t maxOutstanding{1024};
   size_t maxOutstandingError{false};
-  std::shared_ptr<folly::IOThreadPoolExecutor> ioThreads{nullptr};
+  std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreads{nullptr};
 };
 
 template <class If>

diff --git a/mcrouter/lib/network/test/MockMcServerDual.cpp b/mcrouter/lib/network/test/MockMcServerDual.cpp
@@ -138,7 +138,7 @@ int main(int argc, char** argv) {
 
   try {
     // Create IOThreadPoolExecutor and extract event bases
-    std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool =
+    std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool =
         std::make_shared<folly::IOThreadPoolExecutor>(numThreads);
     auto ioThreads = mcrouter::extractEvbs(*ioThreadPool);
 

diff --git a/mcrouter/test/cpp_unit_tests/McrouterClientUsage.cpp b/mcrouter/test/cpp_unit_tests/McrouterClientUsage.cpp
@@ -67,7 +67,7 @@ TEST(CarbonRouterClient, basicUsageSameThreadClient) {
   // request-handling proxies, stats logging, and more.
   // Using createSameThreadClient() makes most sense in situations where the
   // user controls their own EventBases, as below.
-  std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool =
+  std::shared_ptr<folly::IOThreadPoolExecutorBase> ioThreadPool =
       std::make_shared<folly::IOThreadPoolExecutor>(
           opts.num_proxies, opts.num_proxies);
   auto router = CarbonRouterInstance<MemcacheRouterInfo>::init(