mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-07 20:28:31 +00:00
Make sure timings are counted under the proper parents
This commit is contained in:
parent
42f90e94ff
commit
80899ea72c
@ -54,10 +54,11 @@ final class GarbageCollectorManager{
|
|||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
\Logger $logger,
|
\Logger $logger,
|
||||||
|
?TimingsHandler $parentTimings,
|
||||||
){
|
){
|
||||||
gc_disable();
|
gc_disable();
|
||||||
$this->logger = new \PrefixedLogger($logger, "Cyclic Garbage Collector");
|
$this->logger = new \PrefixedLogger($logger, "Cyclic Garbage Collector");
|
||||||
$this->timings = new TimingsHandler("Cyclic Garbage Collector");
|
$this->timings = new TimingsHandler("Cyclic Garbage Collector", $parentTimings);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function adjustGcThreshold(int $cyclesCollected, int $rootsAfterGC) : void{
|
private function adjustGcThreshold(int $cyclesCollected, int $rootsAfterGC) : void{
|
||||||
|
@ -71,7 +71,7 @@ class MemoryManager{
|
|||||||
private Server $server
|
private Server $server
|
||||||
){
|
){
|
||||||
$this->logger = new \PrefixedLogger($server->getLogger(), "Memory Manager");
|
$this->logger = new \PrefixedLogger($server->getLogger(), "Memory Manager");
|
||||||
$this->cycleGcManager = new GarbageCollectorManager($this->logger);
|
$this->cycleGcManager = new GarbageCollectorManager($this->logger, Timings::$memoryManager);
|
||||||
|
|
||||||
$this->init($server->getConfigGroup());
|
$this->init($server->getConfigGroup());
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,7 @@ use pocketmine\snooze\SleeperHandlerEntry;
|
|||||||
use pocketmine\snooze\SleeperNotifier;
|
use pocketmine\snooze\SleeperNotifier;
|
||||||
use pocketmine\thread\log\ThreadSafeLogger;
|
use pocketmine\thread\log\ThreadSafeLogger;
|
||||||
use pocketmine\thread\Worker;
|
use pocketmine\thread\Worker;
|
||||||
|
use pocketmine\timings\Timings;
|
||||||
use pocketmine\utils\AssumptionFailedError;
|
use pocketmine\utils\AssumptionFailedError;
|
||||||
use function ini_set;
|
use function ini_set;
|
||||||
|
|
||||||
@ -72,7 +73,7 @@ class AsyncWorker extends Worker{
|
|||||||
}
|
}
|
||||||
|
|
||||||
self::$notifier = $this->sleeperEntry->createNotifier();
|
self::$notifier = $this->sleeperEntry->createNotifier();
|
||||||
self::$cycleGcManager = new GarbageCollectorManager($this->logger);
|
self::$cycleGcManager = new GarbageCollectorManager($this->logger, Timings::$asyncTaskWorkers);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLogger() : ThreadSafeLogger{
|
public function getLogger() : ThreadSafeLogger{
|
||||||
|
@ -131,7 +131,7 @@ abstract class Timings{
|
|||||||
/** @var TimingsHandler[] */
|
/** @var TimingsHandler[] */
|
||||||
private static array $asyncTaskError = [];
|
private static array $asyncTaskError = [];
|
||||||
|
|
||||||
private static TimingsHandler $asyncTaskWorkers;
|
public static TimingsHandler $asyncTaskWorkers;
|
||||||
/** @var TimingsHandler[] */
|
/** @var TimingsHandler[] */
|
||||||
private static array $asyncTaskRun = [];
|
private static array $asyncTaskRun = [];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user