Parallel - process timeout made configurable

phpstan · Feb 15, 2020 · ebe779c · ebe779c
1 parent bc5c80a
commit ebe779c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -40,6 +40,7 @@ parameters:
 	reportStaticMethodSignatures: false
 	parallel:
 		jobSize: 20
+		processTimeout: 60.0
 	polluteScopeWithLoopInitialAssignments: true
 	polluteScopeWithAlwaysIterableForeach: true
 	polluteCatchScopeWithTryAssignments: false
@@ -148,7 +149,8 @@ parametersSchema:
 	reportMaybesInMethodSignatures: bool()
 	reportStaticMethodSignatures: bool()
 	parallel: structure([
-		jobSize: int()
+		jobSize: int(),
+		processTimeout: float()
 	])
 	polluteScopeWithLoopInitialAssignments: bool()
 	polluteScopeWithAlwaysIterableForeach: bool()
@@ -377,6 +379,7 @@ services:
 		class: PHPStan\Parallel\ParallelAnalyser
 		arguments:
 			internalErrorsCountLimit: %internalErrorsCountLimit%
+			processTimeout: %parallel.processTimeout%
 
 	-
 		class: PHPStan\Parallel\Scheduler

diff --git a/src/Parallel/ParallelAnalyser.php b/src/Parallel/ParallelAnalyser.php
@@ -23,16 +23,21 @@ class ParallelAnalyser
 	/** @var int */
 	private $internalErrorsCountLimit;
 
+	/** @var float */
+	private $processTimeout;
+
 	/** @var ProcessPool */
 	private $processPool;
 
 	public function __construct(
 		IgnoredErrorHelper $ignoredErrorHelper,
-		int $internalErrorsCountLimit
+		int $internalErrorsCountLimit,
+		float $processTimeout
 	)
 	{
 		$this->ignoredErrorHelper = $ignoredErrorHelper;
 		$this->internalErrorsCountLimit = $internalErrorsCountLimit;
+		$this->processTimeout = $processTimeout;
 	}
 
 	/**
@@ -120,7 +125,7 @@ public function analyse(
 				$serverPort,
 				$processIdentifier,
 				$input
-			), $loop);
+			), $loop, $this->processTimeout);
 			$process->start(function (array $json) use ($process, &$internalErrors, &$errors, &$jobs, $postFileCallback, &$hasInferrablePropertyTypesFromConstructor, &$internalErrorsCount, &$reachedInternalErrorsCountLimit, $processIdentifier): void {
 				foreach ($json['errors'] as $jsonError) {
 					if (is_string($jsonError)) {

diff --git a/src/Parallel/Process.php b/src/Parallel/Process.php
@@ -19,6 +19,9 @@ class Process
 	/** @var LoopInterface */
 	private $loop;
 
+	/** @var float */
+	private $timeoutSeconds;
+
 	/** @var WritableStreamInterface */
 	private $in;
 
@@ -39,11 +42,13 @@ class Process
 
 	public function __construct(
 		string $command,
-		LoopInterface $loop
+		LoopInterface $loop,
+		float $timeoutSeconds
 	)
 	{
 		$this->command = $command;
 		$this->loop = $loop;
+		$this->timeoutSeconds = $timeoutSeconds;
 	}
 
 	public function start(callable $onData, callable $onError, callable $onExit): void
@@ -103,9 +108,9 @@ public function request(array $data): void
 	{
 		$this->cancelTimer();
 		$this->in->write($data);
-		$this->timer = $this->loop->addTimer(60.0, function (): void {
+		$this->timer = $this->loop->addTimer($this->timeoutSeconds, function (): void {
 			$onError = $this->onError;
-			$onError(new \Exception('Child process timed out after 60 seconds.'));
+			$onError(new \Exception(sprintf('Child process timed out after %.1f seconds.', $this->timeoutSeconds)));
 		});
 	}