Adding command line parameter to specify the number of HHVM Server Th…

base/HHVMDaemon.php

@@ -118,6 +118,7 @@ protected function getArguments(): Vector<string> {
     if (count($this->options->hhvmExtraArguments) > 0) {
       $args->addAll($this->options->hhvmExtraArguments);
     }
+    $args->add('-dhhvm.server.thread_count='.$this->options->serverThreads);
     if ($this->options->precompile) {
       $bcRepo = $this->options->tempDir.'/hhvm.hhbc';
       $args->add('-v');

base/PHP5Daemon.php

@@ -84,6 +84,11 @@ protected function getArguments(): Vector<string> {
         PerfSettings::BackendPort(),
         $config
       );
+      $config = str_replace(
+        "__CHILDREN__",
+        $this->options->serverThreads,
+        $config
+      );
       $config = str_replace(
         "__TMP_DIR__",
         $this->options->tempDir,

base/PerfOptions.php

@@ -117,6 +117,8 @@ final class PerfOptions {
   public ?string $scriptBeforeWarmup;
   public ?string $scriptAfterWarmup;
   public ?string $scriptAfterBenchmark;
+  public string $serverThreads = '100';
+  public string $clientThreads = '200';
 
   public bool $notBenchmarking = false;
 
@@ -181,6 +183,8 @@ public function __construct(Vector<string> $argv) {
       'daemon-files', // daemon output goes to files in the temp directory
       'temp-dir:', // temp directory to use; if absent one in /tmp is made
       'src-dir:', // location for source to copy into tmp dir instead of ZIP
+      'server-threads:',
+      'client-threads:',
     };
     $targets = $this->getTargetDefinitions()->keys();
     $def->addAll($targets);
@@ -320,7 +324,15 @@ public function __construct(Vector<string> $argv) {
     $this->daemonOutputToFile = $this->getBool('daemon-files');
 
     $argTempDir = $this->getNullableString('temp-dir');
+
+    if(array_key_exists('server-threads', $o)){
+      $this->serverThreads = $this->args['server-threads'];
+    }
 
+    if(array_key_exists('client-threads', $o)){
+      $this->clientThreads = $this->args['client-threads']; 
+    }
+
     if ($argTempDir === null) {
       $this->tempDir = tempnam('/tmp', 'hhvm-nginx');
       // Currently a file - change to a dir
@@ -331,7 +343,6 @@ public function __construct(Vector<string> $argv) {
     }
 
     $this->srcDir = $this->getNullableString('src-dir');
-
   }
 
   public function validate() {

base/PerfSettings.php

@@ -28,10 +28,6 @@ public static function BenchmarkTime(): string {
     return '1M'; // 1 minute
   }
 
-  public static function BenchmarkConcurrency(): int {
-    return 200;
-  }
-
   ///// Server Settings /////
 
   public static function HttpPort(): int {

base/Siege.php

@@ -132,7 +132,7 @@ protected function getArguments(): Vector<string> {
         $arguments->addAll(
           Vector {
             '-c',
-            (string) PerfSettings::BenchmarkConcurrency(),
+            $this->options->clientThreads,
             '-t',
             '1M',
             '-f',
@@ -146,7 +146,7 @@ protected function getArguments(): Vector<string> {
         $arguments->addAll(
           Vector {
             '-c',
-            (string) PerfSettings::BenchmarkConcurrency(),
+            $this->options->clientThreads,
             '-f',
             $urls_file,
             '--benchmark',

conf/php-fpm.conf.in

@@ -24,4 +24,4 @@ listen.allowed_clients = 127.0.0.1
 pm = static
 
 ; The number of child processes to be created when pm is set to 'static'
-pm.max_children = 100
+pm.max_children = __CHILDREN__

conf/php.ini

@@ -15,9 +15,6 @@ assert.active=false
 ;;;;;;;;;;;;;
 ; HHVM Only ;
 ;;;;;;;;;;;;;
-; HHVM's default is 2*CPU cores; this works reasonably well if you're using
-; HHVM's async features, however it's way too low for most other loads.
-hhvm.server.thread_count=100
 ; This is a no-op on production builds, but makes it possible to get meaningful
 ; profiles from debug builds
 hhvm.hhir_generate_asserts=0