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

Added memory limits for AsyncWorkers

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-20 12:15:48 +01:00
parent 8475c63426
commit 17053389b0
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/scheduler/AsyncPool.php
View File

@ -47,9 +47,11 @@ class AsyncPool{
$this->server = $server;
$this->size = $size;
$memoryLimit = (int) max(-1, (int) $this->server->getProperty("memory.async-worker-hard-limit", 1024));
for($i = 0; $i < $this->size; ++$i){
$this->workerUsage[$i] = 0;
$this->workers[$i] = new AsyncWorker($this->server->getLogger(), $i + 1);
$this->workers[$i] = new AsyncWorker($this->server->getLogger(), $i + 1, $memoryLimit);
$this->workers[$i]->setClassLoader($this->server->getLoader());
$this->workers[$i]->start();
}
@ -61,9 +63,12 @@ class AsyncPool{
public function increaseSize(int $newSize){
if($newSize > $this->size){
$memoryLimit = (int) max(-1, (int) $this->server->getProperty("memory.async-worker-hard-limit", 1024));
for($i = $this->size; $i < $newSize; ++$i){
$this->workerUsage[$i] = 0;
$this->workers[$i] = new AsyncWorker($this->server->getLogger(), $i + 1);
$this->workers[$i] = new AsyncWorker($this->server->getLogger(), $i + 1, $memoryLimit);
$this->workers[$i]->setClassLoader($this->server->getLoader());
$this->workers[$i]->start();
}

16
src/pocketmine/scheduler/AsyncWorker.php
View File

@ -31,17 +31,27 @@ class AsyncWorker extends Worker{
private $logger;
private $id;
public function __construct(MainLogger $logger, int $id){
/** @var int */
private $memoryLimit;
public function __construct(MainLogger $logger, int $id, int $memoryLimit){
$this->logger = $logger;
$this->id = $id;
$this->memoryLimit = $memoryLimit;
}
public function run(){
$this->registerClassLoader();
$this->logger->registerStatic();
gc_enable();
ini_set("memory_limit", '-1');
if($this->memoryLimit > 0){
ini_set('memory_limit', $this->memoryLimit . 'M');
$this->logger->debug("Set memory limit to " . $this->memoryLimit . " MB");
}else{
ini_set('memory_limit', '-1');
$this->logger->debug("No memory limit set");
}
global $store;
$store = [];