diff --git a/src/command/Command.php b/src/command/Command.php index 408fdd9db..4e8f93eca 100644 --- a/src/command/Command.php +++ b/src/command/Command.php @@ -30,6 +30,7 @@ use pocketmine\command\utils\CommandException; use pocketmine\lang\TranslationContainer; use pocketmine\permission\PermissionManager; use pocketmine\Server; +use pocketmine\timings\Timings; use pocketmine\timings\TimingsHandler; use pocketmine\utils\TextFormat; use function explode; @@ -139,7 +140,7 @@ abstract class Command{ if($this->timings instanceof TimingsHandler){ $this->timings->remove(); } - $this->timings = new TimingsHandler("** Command: " . $name); + $this->timings = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Command: " . $name); $this->label = $name; return true; diff --git a/src/timings/Timings.php b/src/timings/Timings.php index 85835f5af..0c74a9e54 100644 --- a/src/timings/Timings.php +++ b/src/timings/Timings.php @@ -32,6 +32,8 @@ use pocketmine\scheduler\TaskHandler; use function dechex; abstract class Timings{ + public const INCLUDED_BY_OTHER_TIMINGS_PREFIX = "** "; + /** @var bool */ private static $initialized = false; @@ -121,18 +123,18 @@ abstract class Timings{ self::$initialized = true; self::$fullTickTimer = new TimingsHandler("Full Server Tick"); - self::$serverTickTimer = new TimingsHandler("** Full Server Tick", self::$fullTickTimer); + self::$serverTickTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Full Server Tick", self::$fullTickTimer); self::$memoryManagerTimer = new TimingsHandler("Memory Manager"); self::$garbageCollectorTimer = new TimingsHandler("Garbage Collector", self::$memoryManagerTimer); self::$titleTickTimer = new TimingsHandler("Console Title Tick"); self::$playerNetworkSendTimer = new TimingsHandler("Player Network Send"); - self::$playerNetworkSendCompressTimer = new TimingsHandler("** Player Network Send - Compression", self::$playerNetworkSendTimer); - self::$playerNetworkSendEncryptTimer = new TimingsHandler("** Player Network Send - Encryption", self::$playerNetworkSendTimer); + self::$playerNetworkSendCompressTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression", self::$playerNetworkSendTimer); + self::$playerNetworkSendEncryptTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Encryption", self::$playerNetworkSendTimer); self::$playerNetworkReceiveTimer = new TimingsHandler("Player Network Receive"); - self::$playerNetworkReceiveDecompressTimer = new TimingsHandler("** Player Network Receive - Decompression", self::$playerNetworkReceiveTimer); - self::$playerNetworkReceiveDecryptTimer = new TimingsHandler("** Player Network Receive - Decryption", self::$playerNetworkReceiveTimer); + self::$playerNetworkReceiveDecompressTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Receive - Decompression", self::$playerNetworkReceiveTimer); + self::$playerNetworkReceiveDecryptTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Receive - Decryption", self::$playerNetworkReceiveTimer); self::$playerChunkOrderTimer = new TimingsHandler("Player Order Chunks"); self::$playerChunkSendTimer = new TimingsHandler("Player Send Chunks"); @@ -145,19 +147,19 @@ abstract class Timings{ self::$permissibleCalculationTimer = new TimingsHandler("Permissible Calculation"); self::$permissionDefaultTimer = new TimingsHandler("Default Permission Calculation"); - self::$entityMoveTimer = new TimingsHandler("** entityMove"); - self::$playerCheckNearEntitiesTimer = new TimingsHandler("** checkNearEntities"); - self::$tickEntityTimer = new TimingsHandler("** tickEntity"); - self::$tickTileEntityTimer = new TimingsHandler("** tickTileEntity"); + self::$entityMoveTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "entityMove"); + self::$playerCheckNearEntitiesTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "checkNearEntities"); + self::$tickEntityTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity"); + self::$tickTileEntityTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickTileEntity"); - self::$timerEntityBaseTick = new TimingsHandler("** entityBaseTick"); - self::$timerLivingEntityBaseTick = new TimingsHandler("** livingEntityBaseTick"); + self::$timerEntityBaseTick = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "entityBaseTick"); + self::$timerLivingEntityBaseTick = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "livingEntityBaseTick"); - self::$schedulerSyncTimer = new TimingsHandler("** Scheduler - Sync Tasks"); - self::$schedulerAsyncTimer = new TimingsHandler("** Scheduler - Async Tasks"); + self::$schedulerSyncTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Scheduler - Sync Tasks"); + self::$schedulerAsyncTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Scheduler - Async Tasks"); - self::$playerCommandTimer = new TimingsHandler("** playerCommand"); - self::$craftingDataCacheRebuildTimer = new TimingsHandler("** craftingDataCacheRebuild"); + self::$playerCommandTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "playerCommand"); + self::$craftingDataCacheRebuildTimer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "craftingDataCacheRebuild"); } @@ -181,9 +183,9 @@ abstract class Timings{ $entityType = (new \ReflectionClass($entity))->getShortName(); if(!isset(self::$entityTypeTimingMap[$entityType])){ if($entity instanceof Player){ - self::$entityTypeTimingMap[$entityType] = new TimingsHandler("** tickEntity - EntityPlayer", self::$tickEntityTimer); + self::$entityTypeTimingMap[$entityType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity - EntityPlayer", self::$tickEntityTimer); }else{ - self::$entityTypeTimingMap[$entityType] = new TimingsHandler("** tickEntity - " . $entityType, self::$tickEntityTimer); + self::$entityTypeTimingMap[$entityType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickEntity - " . $entityType, self::$tickEntityTimer); } } @@ -193,7 +195,7 @@ abstract class Timings{ public static function getTileEntityTimings(Tile $tile) : TimingsHandler{ $tileType = (new \ReflectionClass($tile))->getShortName(); if(!isset(self::$tileEntityTypeTimingMap[$tileType])){ - self::$tileEntityTypeTimingMap[$tileType] = new TimingsHandler("** tickTileEntity - " . $tileType, self::$tickTileEntityTimer); + self::$tileEntityTypeTimingMap[$tileType] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "tickTileEntity - " . $tileType, self::$tickTileEntityTimer); } return self::$tileEntityTypeTimingMap[$tileType]; @@ -203,7 +205,7 @@ abstract class Timings{ $pid = $pk->pid(); if(!isset(self::$packetReceiveTimingMap[$pid])){ $pkName = (new \ReflectionClass($pk))->getShortName(); - self::$packetReceiveTimingMap[$pid] = new TimingsHandler("** receivePacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkReceiveTimer); + self::$packetReceiveTimingMap[$pid] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "receivePacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkReceiveTimer); } return self::$packetReceiveTimingMap[$pid]; @@ -213,7 +215,7 @@ abstract class Timings{ $pid = $pk->pid(); if(!isset(self::$packetSendTimingMap[$pid])){ $pkName = (new \ReflectionClass($pk))->getShortName(); - self::$packetSendTimingMap[$pid] = new TimingsHandler("** sendPacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkSendTimer); + self::$packetSendTimingMap[$pid] = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "sendPacket - " . $pkName . " [0x" . dechex($pid) . "]", self::$playerNetworkSendTimer); } return self::$packetSendTimingMap[$pid]; diff --git a/src/world/WorldTimings.php b/src/world/WorldTimings.php index ab8c2d30c..a921cb8f5 100644 --- a/src/world/WorldTimings.php +++ b/src/world/WorldTimings.php @@ -67,26 +67,26 @@ class WorldTimings{ public function __construct(World $world){ $name = $world->getFolderName() . " - "; - $this->setBlock = new TimingsHandler("** " . $name . "setBlock"); - $this->doBlockLightUpdates = new TimingsHandler("** " . $name . "doBlockLightUpdates"); - $this->doBlockSkyLightUpdates = new TimingsHandler("** " . $name . "doBlockSkyLightUpdates"); + $this->setBlock = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "setBlock"); + $this->doBlockLightUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doBlockLightUpdates"); + $this->doBlockSkyLightUpdates = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doBlockSkyLightUpdates"); - $this->doChunkUnload = new TimingsHandler("** " . $name . "doChunkUnload"); - $this->doTickPending = new TimingsHandler("** " . $name . "doTickPending"); - $this->doTickTiles = new TimingsHandler("** " . $name . "doTickTiles"); - $this->doChunkGC = new TimingsHandler("** " . $name . "doChunkGC"); - $this->entityTick = new TimingsHandler("** " . $name . "entityTick"); + $this->doChunkUnload = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doChunkUnload"); + $this->doTickPending = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doTickPending"); + $this->doTickTiles = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doTickTiles"); + $this->doChunkGC = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "doChunkGC"); + $this->entityTick = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "entityTick"); - $this->syncChunkSendTimer = new TimingsHandler("** " . $name . "syncChunkSend"); - $this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "syncChunkSendPrepare"); + $this->syncChunkSendTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkSend"); + $this->syncChunkSendPrepareTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkSendPrepare"); - $this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "syncChunkLoad"); - $this->syncChunkLoadDataTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Data"); - $this->syncChunkLoadEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Entities"); - $this->syncChunkLoadTileEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - TileEntities"); + $this->syncChunkLoadTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkLoad"); + $this->syncChunkLoadDataTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkLoad - Data"); + $this->syncChunkLoadEntitiesTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkLoad - Entities"); + $this->syncChunkLoadTileEntitiesTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkLoad - TileEntities"); Timings::init(); //make sure the timer we want is available - $this->syncChunkSaveTimer = new TimingsHandler("** " . $name . "syncChunkSave", Timings::$worldSaveTimer); + $this->syncChunkSaveTimer = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "syncChunkSave", Timings::$worldSaveTimer); $this->doTick = new TimingsHandler($name . "doTick"); }