add extra thread pool size option

compiler/pipes/register-kphp-configuration.cpp

@@ -140,7 +140,7 @@ void RegisterKphpConfiguration::handle_constant_runtime_options(const ClassMembe
     } else if (vk::any_of_equal(*opt_key,
                                 warmup_workers_part_key_, warmup_instance_cache_elements_part_key_, warmup_timeout_sec_key_,
                                 oom_handling_memory_ratio_key_, mysql_db_name_key_, job_workers_shared_memory_distribution_weights_,
-                                thread_pool_ratio_key_)) {
+                                thread_pool_ratio_key_, thread_pool_size_key_)) {
       generic_register_simple_option(opt_pair->value(), *opt_key);
     } else {
       kphp_error(0, fmt_format("Got unexpected option {}::{}['{}']",

compiler/pipes/register-kphp-configuration.h

@@ -45,6 +45,7 @@ class RegisterKphpConfiguration final : public SyncPipeF<FunctionPtr> {
   const vk::string_view job_workers_shared_memory_distribution_weights_{"--job-workers-shared-memory-distribution-weights"};
 
   const vk::string_view thread_pool_ratio_key_{"--thread-pool-ratio"};
+  const vk::string_view thread_pool_size_key_{"--thread-pool-size"};
 public:
   void execute(FunctionPtr function, DataStream<FunctionPtr> &unused_os) final;
   void on_finish(DataStream<FunctionPtr> &os) override;

runtime/thread-pool.cpp

@@ -9,7 +9,6 @@
 
 
 void ThreadPool::init() noexcept {
-  int thread_pool_size = static_cast<int>(std::ceil(std::thread::hardware_concurrency() * thread_pool_ratio));
   if (!is_thread_pool_available() && thread_pool_size > 0) {
     /**
      * linux does not determinize the thread to which the signal will arrive,
@@ -27,4 +26,4 @@ void ThreadPool::init() noexcept {
   }
 }
 
-double thread_pool_ratio = 0;
+uint32_t thread_pool_size = 0;

runtime/thread-pool.h

@@ -40,4 +40,4 @@ class ThreadPool : vk::not_copyable {
   BS::thread_pool * thread_pool_ptr{nullptr};
 };
 
-extern double thread_pool_ratio;
+extern uint32_t thread_pool_size;

server/php-engine.cpp

@@ -2190,7 +2190,13 @@ int main_args_handler(int i, const char *long_option) {
       return read_option_to(long_option, 0.0, 5.0, hard_timeout);
     }
     case 2035: {
-      return read_option_to(long_option, 0.0, 5.0, thread_pool_ratio);
+      double thread_pool_ratio = 0.0;
+      int res = read_option_to(long_option, 0.0, 10.0, thread_pool_ratio);
+      thread_pool_size = static_cast<int>(std::ceil(std::thread::hardware_concurrency() * thread_pool_ratio));
+      return res;
+    }
+    case 2036: {
+      return read_option_to(long_option, 0U, 2048U, thread_pool_size);
     }
     default:
       return -1;
@@ -2300,6 +2306,7 @@ void parse_main_args(int argc, char *argv[]) {
   parse_option("oom-handling-memory-ratio", required_argument, 2033, "memory ratio of overall script memory to handle OOM errors (default: 0.00)");
   parse_option("hard-time-limit", required_argument, 2034, "time limit for script termination after the main timeout has expired (default: 1 sec). Use 0 to disable");
   parse_option("thread-pool-ratio", required_argument, 2035, "the thread pool size ratio of the overall cpu numbers");
+  parse_option("thread-pool-size", required_argument, 2036, "the total threads num per worker");
   parse_engine_options_long(argc, argv, main_args_handler);
   parse_main_args_till_option(argc, argv);
   // TODO: remove it after successful migration from kphb.readyV2 to kphb.readyV3

tests/phpt/kphp_configuration/9_thread_pool_ratio.php → tests/phpt/kphp_configuration/10_thread_pool_size.php

@@ -3,6 +3,7 @@
 
 class KphpConfiguration {
   const DEFAULT_RUNTIME_OPTIONS = [
+    "--thread-pool-size" => "10",
     "--thread-pool-ratio" => "0.42",
   ];
 }