mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-11 05:52:05 +00:00
Code Issues Projects Releases Wiki Activity

Implement handlers stuck detection system

Browse Source
This commit is contained in:
ShockedPlot7560 2025-08-05 15:37:24 +02:00
parent 31275ba681
commit 39c9387efe
No known key found for this signature in database
GPG Key ID: 894B86FF21BB1EF5
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/event/AsyncEvent.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\event;
use pocketmine\promise\Promise; use pocketmine\promise\Promise;
use pocketmine\promise\PromiseResolver; use pocketmine\promise\PromiseResolver;
use pocketmine\timings\Timings; use pocketmine\timings\Timings;
use pocketmine\utils\Utils;
use function count; use function count;
/** /**
@ -35,27 +36,17 @@ use function count;
* When all the promises of a priority level have been resolved, the next priority level is called. * When all the promises of a priority level have been resolved, the next priority level is called.
*/ */
abstract class AsyncEvent{ abstract class AsyncEvent{
/** @var array<class-string<AsyncEvent>, int> $delegatesCallDepth */ /** @var array<int, int> $handlersCallState */
private static array $delegatesCallDepth = []; private static array $handlersCallState = [];
private const MAX_EVENT_CALL_DEPTH = 50; private const MAX_CONCURRENT_CALLS = 1000; //max number of concurrent calls to a single handler
/** /**
* @phpstan-return Promise<static> * @phpstan-return Promise<static>
*/ */
final public function call() : Promise{ final public function call() : Promise{
if(!isset(self::$delegatesCallDepth[$class = static::class])){
self::$delegatesCallDepth[$class] = 0;
}
if(self::$delegatesCallDepth[$class] >= self::MAX_EVENT_CALL_DEPTH){
//this exception will be caught by the parent event call if all else fails
throw new \RuntimeException("Recursive event call detected (reached max depth of " . self::MAX_EVENT_CALL_DEPTH . " calls)");
}
$timings = Timings::getAsyncEventTimings($this); $timings = Timings::getAsyncEventTimings($this);
$timings->startTiming(); $timings->startTiming();
++self::$delegatesCallDepth[$class];
try{ try{
/** @phpstan-var PromiseResolver<static> $globalResolver */ /** @phpstan-var PromiseResolver<static> $globalResolver */
$globalResolver = new PromiseResolver(); $globalResolver = new PromiseResolver();
@ -69,7 +60,6 @@ abstract class AsyncEvent{
return $globalResolver->getPromise(); return $globalResolver->getPromise();
}finally{ }finally{
--self::$delegatesCallDepth[$class];
$timings->stopTiming(); $timings->stopTiming();
} }
} }
@ -91,11 +81,25 @@ abstract class AsyncEvent{
} }
$currentPriority = $priority; $currentPriority = $priority;
$handlerId = spl_object_id($handler) << 3 | $priority;
if(!isset(self::$handlersCallState[$handlerId])){
self::$handlersCallState[$handlerId] = 0;
}
if(self::$handlersCallState[$handlerId] >= self::MAX_CONCURRENT_CALLS){
throw new \RuntimeException("Concurrent call limit reached for handler " .
Utils::getNiceClosureName($handler->getHandler()) . "(" . Utils::getNiceClassName($this) . ")" .
" (max: " . self::MAX_CONCURRENT_CALLS . ")");
}
$removeCallback = static fn() => --self::$handlersCallState[$handlerId];
if($handler->canBeCalledConcurrently()){ if($handler->canBeCalledConcurrently()){
unset($handlers[$k]); unset($handlers[$k]);
++self::$handlersCallState[$handlerId];
$promise = $handler->callAsync($this); $promise = $handler->callAsync($this);
if($promise !== null){ if($promise !== null){
$promise->onCompletion($removeCallback, $removeCallback);
$awaitPromises[] = $promise; $awaitPromises[] = $promise;
}else{
$removeCallback();
} }
}else{ }else{
if(count($awaitPromises) > 0){ if(count($awaitPromises) > 0){
@ -104,14 +108,17 @@ abstract class AsyncEvent{
} }
unset($handlers[$k]); unset($handlers[$k]);
++self::$handlersCallState[$handlerId];
$promise = $handler->callAsync($this); $promise = $handler->callAsync($this);
if($promise !== null){ if($promise !== null){
$promise->onCompletion($removeCallback, $removeCallback);
$promise->onCompletion( $promise->onCompletion(
onSuccess: fn() => $this->processRemainingHandlers($handlers, $resolve, $reject), onSuccess: fn() => $this->processRemainingHandlers($handlers, $resolve, $reject),
onFailure: $reject onFailure: $reject
); );
return; return;
} }
$removeCallback();
} }
} }