Simplify callback collect when multiple threads are collected by one callback

Author: dktapps

src/Server.php

@@ -125,7 +125,6 @@
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Filesystem\Path;
 use function array_fill;
-use function array_merge;
 use function array_sum;
 use function base64_encode;
 use function chr;
@@ -913,25 +912,16 @@ public function __construct(
 					$this->asyncPool->submitTaskToWorker(new TimingsControlTask(TimingsControlTask::RESET), $workerId);
 				}
 			});
-			TimingsHandler::getCollectCallbacks()->add(function() : Promise{
+			TimingsHandler::getCollectCallbacks()->add(function() : array{
 				$promises = [];
 				foreach($this->asyncPool->getRunningWorkers() as $workerId){
 					$resolver = new PromiseResolver();
 					$this->asyncPool->submitTaskToWorker(new TimingsCollectionTask($resolver), $workerId);
 
 					$promises[] = $resolver->getPromise();
 				}
-				$resolver = new PromiseResolver();
-				Promise::all($promises)->onCompletion(
-					function(array $workerRecords) use ($resolver) : void{
-						$resolver->resolve(array_merge(...$workerRecords));
-					},
-					function() : void{
-						throw new AssumptionFailedError("TimingsCollectionTask should never reject a promise");
-					}
-				);
 
-				return $resolver->getPromise();
+				return $promises;
 			});
 
 			$netCompressionThreshold = -1;

src/timings/TimingsHandler.php

@@ -29,10 +29,14 @@
 use pocketmine\utils\ObjectSet;
 use pocketmine\utils\Utils;
 use function array_merge;
+use function array_push;
 use function hrtime;
 use function implode;
 use function spl_object_id;
 
+/**
+ * @phpstan-type CollectPromise Promise<list<string>>
+ */
 class TimingsHandler{
 	private const FORMAT_VERSION = 3; //thread timings collection
 
@@ -43,7 +47,7 @@ class TimingsHandler{
 	private static ?ObjectSet $toggleCallbacks = null;
 	/** @phpstan-var ObjectSet<\Closure() : void> */
 	private static ?ObjectSet $resetCallbacks = null;
-	/** @phpstan-var ObjectSet<\Closure() : Promise<list<string>>> */
+	/** @phpstan-var ObjectSet<\Closure() : list<CollectPromise>> */
 	private static ?ObjectSet $collectCallbacks = null;
 
 	/**
@@ -57,7 +61,7 @@ public static function getToggleCallbacks() : ObjectSet{ return self::$toggleCal
 	public static function getResetCallbacks() : ObjectSet{ return self::$resetCallbacks ??= new ObjectSet(); }
 
 	/**
-	 * @phpstan-return ObjectSet<\Closure() : Promise<list<string>>>
+	 * @phpstan-return ObjectSet<\Closure() : list<CollectPromise>>
 	 */
 	public static function getCollectCallbacks() : ?ObjectSet{ return self::$collectCallbacks ??= new ObjectSet(); }
 
@@ -151,7 +155,8 @@ public static function requestPrintTimings() : Promise{
 		$otherThreadRecordPromises = [];
 		if(self::$collectCallbacks !== null){
 			foreach(self::$collectCallbacks as $callback){
-				$otherThreadRecordPromises[] = $callback();
+				$callbackPromises = $callback();
+				array_push($otherThreadRecordPromises, ...$callbackPromises);
 			}
 		}