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

MemoryManager: Use get_declared_classes() to build lists of static properties

Browse Source 
This makes memory dumping independent from the autoloader implementation, and fixes #1958.
This commit is contained in:
Dylan K. Taylor 2018-01-23 18:23:53 +00:00
parent 6ddbdc9dc1
commit 8e1394bf53
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pocketmine/MemoryManager.php
View File

@ -265,7 +265,7 @@ class MemoryManager{
*/
public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
MainLogger::getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
self::dumpMemory($this->server, $this->server->getLoader(), $outputFolder, $maxNesting, $maxStringSize);
self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize);
if($this->dumpWorkers){
$scheduler = $this->server->getScheduler();
@ -278,13 +278,14 @@ class MemoryManager{
/**
* Static memory dumper accessible from any thread.
*
* @param mixed $startingObject
* @param \ClassLoader $loader
* @param string $outputFolder
* @param int $maxNesting
* @param int $maxStringSize
* @param mixed $startingObject
* @param string $outputFolder
* @param int $maxNesting
* @param int $maxStringSize
*
* @throws \ReflectionException
*/
public static function dumpMemory($startingObject, \ClassLoader $loader, string $outputFolder, int $maxNesting, int $maxStringSize){
public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize){
$hardLimit = ini_get('memory_limit');
ini_set('memory_limit', '-1');
gc_disable();
@ -306,7 +307,7 @@ class MemoryManager{
$staticProperties = [];
$staticCount = 0;
foreach($loader->getClasses() as $className){
foreach(get_declared_classes() as $className){
$reflection = new \ReflectionClass($className);
$staticProperties[$className] = [];
foreach($reflection->getProperties() as $property){

1
src/pocketmine/scheduler/DumpWorkerMemoryTask.php
View File

@ -52,7 +52,6 @@ class DumpWorkerMemoryTask extends AsyncTask{
MemoryManager::dumpMemory(
["worker" => $this->worker, "store" => $store],
$this->worker->getClassLoader(),
$this->outputFolder . DIRECTORY_SEPARATOR . "AsyncWorker#" . $this->worker->getAsyncWorkerId(),
$this->maxNesting,
$this->maxStringSize