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

Moved chunk garbage collector to memory manager

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-19 16:14:54 +02:00
parent 05385acb36
commit bf4a8398c4
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/MemoryManager.php
View File

@ -48,6 +48,7 @@ class MemoryManager{
private $garbageCollectionAsync; private $garbageCollectionAsync;
private $chunkLimit; private $chunkLimit;
private $chunkCollect;
private $chunkTrigger; private $chunkTrigger;
private $chunkCache; private $chunkCache;
@ -71,6 +72,7 @@ class MemoryManager{
$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->chunkLimit = (int) $this->server->getProperty("memory.max-chunks.trigger-limit", 12000); $this->chunkLimit = (int) $this->server->getProperty("memory.max-chunks.trigger-limit", 12000);
$this->chunkCollect = (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->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true);
$this->chunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true); $this->chunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
@ -100,6 +102,12 @@ class MemoryManager{
} }
} }
if($this->chunkTrigger and $this->chunkCollect){
foreach($this->server->getLevels() as $level){
$level->doChunkGarbageCollection();
}
}
$ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount); $ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount);
$this->server->getPluginManager()->callEvent($ev); $this->server->getPluginManager()->callEvent($ev);

10
src/pocketmine/Server.php
View File

@ -1707,10 +1707,6 @@ class Server{
$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doAutoSave"]), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000)); $this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doAutoSave"]), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000));
} }
if($this->getProperty("chunk-gc.period-in-ticks", 600) > 0){
$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doLevelGC"]), $this->getProperty("chunk-gc.period-in-ticks", 600), $this->getProperty("chunk-gc.period-in-ticks", 600));
}
$this->enablePlugins(PluginLoadOrder::POSTWORLD); $this->enablePlugins(PluginLoadOrder::POSTWORLD);
$this->start(); $this->start();
@ -2223,12 +2219,6 @@ class Server{
} }
} }
public function doLevelGC(){
foreach($this->getLevels() as $level){
$level->doChunkGarbageCollection();
}
}
public function sendUsage(){ public function sendUsage(){
if($this->lastSendUsage instanceof SendUsageTask){ if($this->lastSendUsage instanceof SendUsageTask){
if(!$this->lastSendUsage->isGarbage()){ //do not call multiple times if(!$this->lastSendUsage->isGarbage()){ //do not call multiple times

7
src/pocketmine/resources/pocketmine.yml
View File

@ -56,6 +56,10 @@ memory:
max-chunks: max-chunks:
#Limit of chunks to load per player, overrides chunk-sending.max-chunks #Limit of chunks to load per player, overrides chunk-sending.max-chunks
trigger-limit: 96 trigger-limit: 96
#Do chunk garbage collection on trigger
trigger-chunk-collect: true
#Trigger on low memory #Trigger on low memory
low-memory-trigger: true low-memory-trigger: true
@ -117,9 +121,6 @@ chunk-generation:
#Max. amount of chunks in the waiting queue to be populated #Max. amount of chunks in the waiting queue to be populated
population-queue-size: 2 population-queue-size: 2
chunk-gc:
period-in-ticks: 600
ticks-per: ticks-per:
animal-spawns: 400 animal-spawns: 400
monster-spawns: 1 monster-spawns: 1