Avoid PHP object allocation issue

PooledWorker::__destruct() is run even if $this->selectWorker() never returns because the object is allocated prior to the constructor call.
amphp · Feb 8, 2025 · a922ec7 · a922ec7
1 parent 5113111
commit a922ec7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Worker/ContextWorkerPool.php b/src/Worker/ContextWorkerPool.php
@@ -213,7 +213,8 @@ private static function killWorkers(
 
     public function getWorker(): Worker
     {
-        return new Internal\PooledWorker($this->pull(), $this->push);
+        $worker = $this->pull();
+        return new Internal\PooledWorker($worker, $this->push);
     }
 
     /**

diff --git a/src/Worker/DelegatingWorkerPool.php b/src/Worker/DelegatingWorkerPool.php
@@ -118,7 +118,8 @@ private function clearWaiting(\Throwable $exception): void
 
     public function getWorker(): Worker
     {
-        return new PooledWorker($this->selectWorker(), $this->push(...));
+        $worker = $this->selectWorker();
+        return new PooledWorker($worker, $this->push(...));
     }
 
     public function getWorkerLimit(): int