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

Timings: rename core timers to remove 'timer' from the names

Browse Source 
this makes them shorter and more consistent.
This commit is contained in:
Dylan K. Taylor
2020-12-23 17:52:25 +00:00
parent 1d7b65e0c2
commit bcc3e87730
14 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/world/World.php
View File

@ -787,7 +787,7 @@ class World implements ChunkManager{
$this->timings->entityTick->startTiming();
//Update entities that need update
Timings::$tickEntityTimer->startTiming();
Timings::$tickEntity->startTiming();
foreach($this->updateEntities as $id => $entity){
if($entity->isClosed() or !$entity->onUpdate($currentTick)){
unset($this->updateEntities[$id]);
@ -796,7 +796,7 @@ class World implements ChunkManager{
$entity->close();
}
}
Timings::$tickEntityTimer->stopTiming();
Timings::$tickEntity->stopTiming();
$this->timings->entityTick->stopTiming();
$this->timings->doTickTiles->startTiming();
@ -1039,7 +1039,7 @@ class World implements ChunkManager{
}
public function saveChunks() : void{
$this->timings->syncChunkSaveTimer->startTiming();
$this->timings->syncChunkSave->startTiming();
try{
foreach($this->chunks as $chunkHash => $chunk){
if($chunk->isDirty()){
@ -1049,7 +1049,7 @@ class World implements ChunkManager{
}
}
}finally{
$this->timings->syncChunkSaveTimer->stopTiming();
$this->timings->syncChunkSave->stopTiming();
}
}
@ -1997,7 +1997,7 @@ class World implements ChunkManager{
}
public function generateChunkCallback(int $x, int $z, ?Chunk $chunk) : void{
Timings::$generationCallbackTimer->startTiming();
Timings::$generationCallback->startTiming();
if(isset($this->chunkPopulationQueue[$index = World::chunkHash($x, $z)])){
for($xx = -1; $xx <= 1; ++$xx){
for($zz = -1; $zz <= 1; ++$zz){
@ -2025,7 +2025,7 @@ class World implements ChunkManager{
}elseif($chunk !== null){
$this->setChunk($x, $z, $chunk, false);
}
Timings::$generationCallbackTimer->stopTiming();
Timings::$generationCallback->stopTiming();
}
/**
@ -2303,11 +2303,11 @@ class World implements ChunkManager{
return $this->chunks[$chunkHash];
}
$this->timings->syncChunkLoadTimer->startTiming();
$this->timings->syncChunkLoad->startTiming();
$this->cancelUnloadChunkRequest($x, $z);
$this->timings->syncChunkLoadDataTimer->startTiming();
$this->timings->syncChunkLoadData->startTiming();
$chunk = null;
@ -2317,10 +2317,10 @@ class World implements ChunkManager{
$this->logger->critical("Failed to load chunk x=$x z=$z: " . $e->getMessage());
}
$this->timings->syncChunkLoadDataTimer->stopTiming();
$this->timings->syncChunkLoadData->stopTiming();
if($chunk === null){
$this->timings->syncChunkLoadTimer->stopTiming();
$this->timings->syncChunkLoad->stopTiming();
return null;
}
@ -2339,14 +2339,14 @@ class World implements ChunkManager{
$listener->onChunkLoaded($x, $z, $chunk);
}
$this->timings->syncChunkLoadTimer->stopTiming();
$this->timings->syncChunkLoad->stopTiming();
return $chunk;
}
private function initChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
if($chunk->NBTentities !== null){
$this->timings->syncChunkLoadEntitiesTimer->startTiming();
$this->timings->syncChunkLoadEntities->startTiming();
$entityFactory = EntityFactory::getInstance();
foreach($chunk->NBTentities as $nbt){
try{
@ -2370,10 +2370,10 @@ class World implements ChunkManager{
$chunk->setDirtyFlag(Chunk::DIRTY_FLAG_ENTITIES, true);
$chunk->NBTentities = null;
$this->timings->syncChunkLoadEntitiesTimer->stopTiming();
$this->timings->syncChunkLoadEntities->stopTiming();
}
if($chunk->NBTtiles !== null){
$this->timings->syncChunkLoadTileEntitiesTimer->startTiming();
$this->timings->syncChunkLoadTileEntities->startTiming();
$tileFactory = TileFactory::getInstance();
foreach($chunk->NBTtiles as $nbt){
if(($tile = $tileFactory->createFromData($this, $nbt)) !== null){
@ -2386,7 +2386,7 @@ class World implements ChunkManager{
$chunk->setDirtyFlag(Chunk::DIRTY_FLAG_TILES, true);
$chunk->NBTtiles = null;
$this->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
$this->timings->syncChunkLoadTileEntities->stopTiming();
}
}
@ -2433,11 +2433,11 @@ class World implements ChunkManager{
}
if($trySave and $this->getAutoSave() and $chunk->isDirty()){
$this->timings->syncChunkSaveTimer->startTiming();
$this->timings->syncChunkSave->startTiming();
try{
$this->provider->saveChunk($x, $z, $chunk);
}finally{
$this->timings->syncChunkSaveTimer->stopTiming();
$this->timings->syncChunkSave->stopTiming();
}
}
@ -2632,7 +2632,7 @@ class World implements ChunkManager{
$chunk = $this->loadChunk($x, $z);
if($chunk === null || !$chunk->isPopulated()){
Timings::$populationTimer->startTiming();
Timings::$population->startTiming();
$this->chunkPopulationQueue[$index] = true;
for($xx = -1; $xx <= 1; ++$xx){
@ -2648,7 +2648,7 @@ class World implements ChunkManager{
}
$this->workerPool->submitTaskToWorker($task, $workerId);
Timings::$populationTimer->stopTiming();
Timings::$population->stopTiming();
return false;
}

4
src/world/WorldManager.php
View File

@ -374,7 +374,7 @@ class WorldManager{
}
private function doAutoSave() : void{
Timings::$worldSaveTimer->startTiming();
Timings::$worldSave->startTiming();
foreach($this->worlds as $world){
foreach($world->getPlayers() as $player){
if($player->spawned){
@ -383,6 +383,6 @@ class WorldManager{
}
$world->save(false);
}
Timings::$worldSaveTimer->stopTiming();
Timings::$worldSave->stopTiming();
}
}

28
src/world/WorldTimings.php
View File

@ -49,20 +49,20 @@ class WorldTimings{
public $doTick;
/** @var TimingsHandler */
public $syncChunkSendTimer;
public $syncChunkSend;
/** @var TimingsHandler */
public $syncChunkSendPrepareTimer;
public $syncChunkSendPrepare;
/** @var TimingsHandler */
public $syncChunkLoadTimer;
public $syncChunkLoad;
/** @var TimingsHandler */
public $syncChunkLoadDataTimer;
public $syncChunkLoadData;
/** @var TimingsHandler */
public $syncChunkLoadEntitiesTimer;
public $syncChunkLoadEntities;
/** @var TimingsHandler */
public $syncChunkLoadTileEntitiesTimer;
public $syncChunkLoadTileEntities;
/** @var TimingsHandler */
public $syncChunkSaveTimer;
public $syncChunkSave;
public function __construct(World $world){
$name = $world->getFolderName() . " - ";
@ -78,14 +78,14 @@ class WorldTimings{
$this->entityTick = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Tick Entities");
Timings::init(); //make sure the timers we want are available
$this->syncChunkSendTimer = new TimingsHandler("** " . $name . "Player Send Chunks", Timings::$playerChunkSendTimer);
$this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "Player Send Chunk Prepare", Timings::$playerChunkSendTimer);
$this->syncChunkSend = new TimingsHandler("** " . $name . "Player Send Chunks", Timings::$playerChunkSend);
$this->syncChunkSendPrepare = new TimingsHandler("** " . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend);
$this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "Chunk Load", Timings::$worldLoadTimer);
$this->syncChunkLoadDataTimer = new TimingsHandler("** " . $name . "Chunk Load - Data");
$this->syncChunkLoadEntitiesTimer = new TimingsHandler("** " . $name . "Chunk Load - Entities");
$this->syncChunkLoadTileEntitiesTimer = new TimingsHandler("** " . $name . "Chunk Load - TileEntities");
$this->syncChunkSaveTimer = new TimingsHandler("** " . $name . "Chunk Save", Timings::$worldSaveTimer);
$this->syncChunkLoad = new TimingsHandler("** " . $name . "Chunk Load", Timings::$worldLoad);
$this->syncChunkLoadData = new TimingsHandler("** " . $name . "Chunk Load - Data");
$this->syncChunkLoadEntities = new TimingsHandler("** " . $name . "Chunk Load - Entities");
$this->syncChunkLoadTileEntities = new TimingsHandler("** " . $name . "Chunk Load - TileEntities");
$this->syncChunkSave = new TimingsHandler("** " . $name . "Chunk Save", Timings::$worldSave);
$this->doTick = new TimingsHandler($name . "World Tick");
}