adressed review comments

Author: Mateusz Kopciński

packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.cpp

@@ -1,6 +1,5 @@
 #include "RnExecutorchInstaller.h"
 
-#include <rnexecutorch/Log.h>
 #include <rnexecutorch/TokenizerModule.h>
 #include <rnexecutorch/host_objects/JsiConversions.h>
 #include <rnexecutorch/models/classification/Classification.h>
@@ -15,7 +14,7 @@
 #include <rnexecutorch/models/style_transfer/StyleTransfer.h>
 #include <rnexecutorch/models/vertical_ocr/VerticalOCR.h>
 #include <rnexecutorch/threads/GlobalThreadPool.h>
-#include <rnexecutorch/threads/ThreadUtils.h>
+#include <rnexecutorch/threads/utils/ThreadUtils.h>
 
 namespace rnexecutorch {
 
@@ -94,7 +93,7 @@ void RnExecutorchInstaller::injectJSIBindings(
       RnExecutorchInstaller::loadModel<models::speech_to_text::SpeechToText>(
           jsiRuntime, jsCallInvoker, "loadSpeechToText"));
 
-  threads::ThreadUtils::unsafeSetupThreadPool();
+  threads::utils::unsafeSetupThreadPool();
   threads::GlobalThreadPool::initialize();
 }
 

packages/react-native-executorch/common/rnexecutorch/threads/GlobalThreadPool.h

@@ -4,43 +4,42 @@
 #include <executorch/extension/threadpool/cpuinfo_utils.h>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <rnexecutorch/Log.h>
 #include <rnexecutorch/threads/HighPerformanceThreadPool.h>
 
-namespace rnexecutorch {
-namespace threads {
+namespace rnexecutorch::threads {
 
 class GlobalThreadPool {
-private:
-  inline static std::unique_ptr<HighPerformanceThreadPool> instance;
-  inline static std::once_flag initFlag;
-
+public:
   GlobalThreadPool() = delete;
+  GlobalThreadPool(const GlobalThreadPool &) = delete;
+  GlobalThreadPool &operator=(const GlobalThreadPool &) = delete;
+  GlobalThreadPool(GlobalThreadPool &&) = delete;
+  GlobalThreadPool &operator=(GlobalThreadPool &&) = delete;
 
-public:
-  static void initialize(uint32_t numThreads = 0, ThreadConfig config = {}) {
+  static HighPerformanceThreadPool &get() {
+    if (!instance) {
+      initialize();
+    }
+    return *instance;
+  }
+
+  static void initialize(std::optional<uint32_t> numThreads = std::nullopt,
+                         ThreadConfig config = {}) {
     std::call_once(initFlag, [&numThreads, config]() {
-      // Auto-detect optimal thread count if not specified
-      if (numThreads == 0) {
+      if (!numThreads) {
         numThreads =
             ::executorch::extension::cpuinfo::get_num_performant_cores();
       }
 
       log(rnexecutorch::LOG_LEVEL::Info, "Initializing global thread pool with",
           numThreads, "threads");
-      instance =
-          std::make_unique<HighPerformanceThreadPool>(numThreads, config);
+      instance = std::make_unique<HighPerformanceThreadPool>(numThreads.value(),
+                                                             config);
     });
   }
 
-  // Get the global thread pool instance
-  static HighPerformanceThreadPool &get() {
-    if (!instance) {
-      initialize();
-    }
-    return *instance;
-  }
-
   // Convenience methods that mirror std::thread interface
   template <typename Func, typename... Args>
   static auto async(Func &&func, Args &&...args) {
@@ -71,7 +70,10 @@ class GlobalThreadPool {
       instance.reset();
     }
   }
+
+private:
+  inline static std::unique_ptr<HighPerformanceThreadPool> instance;
+  inline static std::once_flag initFlag;
 };
 
-} // namespace threads
-} // namespace rnexecutorch
+} // namespace rnexecutorch::threads