mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 06:25:32 +00:00
Code Issues Projects Releases Wiki Activity

Given some MemoryManager fields less confusing names

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-11 13:27:33 +01:00
parent 4981931c4a
commit 8d095dff6c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pocketmine/MemoryManager.php
View File

@ -65,16 +65,16 @@ class MemoryManager{
private $garbageCollectionAsync; private $garbageCollectionAsync;
/** @var int */ /** @var int */
private $chunkRadiusOverride; private $lowMemChunkRadiusOverride;
/** @var bool */ /** @var bool */
private $chunkCollect; private $lowMemChunkGC;
/** @var bool */ /** @var bool */
private $chunkTrigger; private $lowMemReduceChunkRadius;
/** @var bool */ /** @var bool */
private $disableChunkCacheOnLowMemory; private $lowMemDisableChunkCache;
/** @var bool */ /** @var bool */
private $cacheTrigger; private $lowMemClearWorldCache;
/** @var bool */ /** @var bool */
private $dumpWorkers = true; private $dumpWorkers = true;
@ -129,12 +129,12 @@ class MemoryManager{
$this->garbageCollectionTrigger = (bool) $this->server->getProperty("memory.garbage-collection.low-memory-trigger", true); $this->garbageCollectionTrigger = (bool) $this->server->getProperty("memory.garbage-collection.low-memory-trigger", true);
$this->garbageCollectionAsync = (bool) $this->server->getProperty("memory.garbage-collection.collect-async-worker", true); $this->garbageCollectionAsync = (bool) $this->server->getProperty("memory.garbage-collection.collect-async-worker", true);
$this->chunkRadiusOverride = (int) $this->server->getProperty("memory.max-chunks.chunk-radius", 4); $this->lowMemChunkRadiusOverride = (int) $this->server->getProperty("memory.max-chunks.chunk-radius", 4);
$this->chunkCollect = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true); $this->lowMemChunkGC = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true);
$this->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true); $this->lowMemReduceChunkRadius = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true);
$this->disableChunkCacheOnLowMemory = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true); $this->lowMemDisableChunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
$this->cacheTrigger = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true); $this->lowMemClearWorldCache = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true);
$this->dumpWorkers = (bool) $this->server->getProperty("memory.memory-dump.dump-async-worker", true); $this->dumpWorkers = (bool) $this->server->getProperty("memory.memory-dump.dump-async-worker", true);
gc_enable(); gc_enable();
@ -151,7 +151,7 @@ class MemoryManager{
* @return bool * @return bool
*/ */
public function canUseChunkCache() : bool{ public function canUseChunkCache() : bool{
return !$this->lowMemory or !$this->disableChunkCacheOnLowMemory; return !$this->lowMemory or !$this->lowMemDisableChunkCache;
} }
/** /**
@ -162,7 +162,7 @@ class MemoryManager{
* @return int * @return int
*/ */
public function getViewDistance(int $distance) : int{ public function getViewDistance(int $distance) : int{
return $this->lowMemory ? (int) min($this->chunkRadiusOverride, $distance) : $distance; return $this->lowMemory ? (int) min($this->lowMemChunkRadiusOverride, $distance) : $distance;
} }
/** /**
@ -176,13 +176,13 @@ class MemoryManager{
public function trigger(int $memory, int $limit, bool $global = false, int $triggerCount = 0){ public function trigger(int $memory, int $limit, bool $global = false, int $triggerCount = 0){
$this->server->getLogger()->debug(sprintf("[Memory Manager] %sLow memory triggered, limit %gMB, using %gMB", $this->server->getLogger()->debug(sprintf("[Memory Manager] %sLow memory triggered, limit %gMB, using %gMB",
$global ? "Global " : "", round(($limit / 1024) / 1024, 2), round(($memory / 1024) / 1024, 2))); $global ? "Global " : "", round(($limit / 1024) / 1024, 2), round(($memory / 1024) / 1024, 2)));
if($this->cacheTrigger){ if($this->lowMemClearWorldCache){
foreach($this->server->getLevels() as $level){ foreach($this->server->getLevels() as $level){
$level->clearCache(true); $level->clearCache(true);
} }
} }
if($this->chunkTrigger and $this->chunkCollect){ if($this->lowMemReduceChunkRadius and $this->lowMemChunkGC){
foreach($this->server->getLevels() as $level){ foreach($this->server->getLevels() as $level){
$level->doChunkGarbageCollection(); $level->doChunkGarbageCollection();
} }