mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

AsyncTask: Remove misleading methods getFromThreadStore(),saveToThreadStore(),removeFromThreadStore()

Browse Source 
These methods are commonly mixed up when we talk about thread-local storage. What these things actually do is store persistent data on the worker thread.
This commit is contained in:
Dylan K. Taylor 2019-04-02 14:57:11 +01:00
parent 6214a9398d
commit 2c4f2810d2
4 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/level/generator/GeneratorRegisterTask.php
View File

@ -51,13 +51,13 @@ class GeneratorRegisterTask extends AsyncTask{
BlockFactory::init(); BlockFactory::init();
Biome::init(); Biome::init();
$manager = new SimpleChunkManager($this->worldHeight); $manager = new SimpleChunkManager($this->worldHeight);
$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager); $this->worker->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);
/** /**
* @var Generator $generator * @var Generator $generator
* @see Generator::__construct() * @see Generator::__construct()
*/ */
$generator = new $this->generatorClass($manager, $this->seed, unserialize($this->settings)); $generator = new $this->generatorClass($manager, $this->seed, unserialize($this->settings));
$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator); $this->worker->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);
} }
} }

4
src/pocketmine/level/generator/GeneratorUnregisterTask.php
View File

@ -35,7 +35,7 @@ class GeneratorUnregisterTask extends AsyncTask{
} }
public function onRun() : void{ public function onRun() : void{
$this->removeFromThreadStore("generation.level{$this->levelId}.manager"); $this->worker->removeFromThreadStore("generation.level{$this->levelId}.manager");
$this->removeFromThreadStore("generation.level{$this->levelId}.generator"); $this->worker->removeFromThreadStore("generation.level{$this->levelId}.generator");
} }
} }

4
src/pocketmine/level/generator/PopulationTask.php
View File

@ -58,9 +58,9 @@ class PopulationTask extends AsyncTask{
public function onRun() : void{ public function onRun() : void{
/** @var SimpleChunkManager $manager */ /** @var SimpleChunkManager $manager */
$manager = $this->getFromThreadStore("generation.level{$this->levelId}.manager"); $manager = $this->worker->getFromThreadStore("generation.level{$this->levelId}.manager");
/** @var Generator $generator */ /** @var Generator $generator */
$generator = $this->getFromThreadStore("generation.level{$this->levelId}.generator"); $generator = $this->worker->getFromThreadStore("generation.level{$this->levelId}.generator");
if($manager === null or $generator === null){ if($manager === null or $generator === null){
$this->state = false; $this->state = false;
return; return;

39
src/pocketmine/scheduler/AsyncTask.php
View File

@ -138,45 +138,6 @@ abstract class AsyncTask extends \Threaded{
return $this->submitted; return $this->submitted;
} }
/**
* @see AsyncWorker::getFromThreadStore()
*
* @param string $identifier
*
* @return mixed
*/
public function getFromThreadStore(string $identifier){
if($this->worker === null or $this->isFinished()){
throw new \BadMethodCallException("Objects stored in AsyncWorker thread-local storage can only be retrieved during task execution");
}
return $this->worker->getFromThreadStore($identifier);
}
/**
* @see AsyncWorker::saveToThreadStore()
*
* @param string $identifier
* @param mixed $value
*/
public function saveToThreadStore(string $identifier, $value) : void{
if($this->worker === null or $this->isFinished()){
throw new \BadMethodCallException("Objects can only be added to AsyncWorker thread-local storage during task execution");
}
$this->worker->saveToThreadStore($identifier, $value);
}
/**
* @see AsyncWorker::removeFromThreadStore()
*
* @param string $identifier
*/
public function removeFromThreadStore(string $identifier) : void{
if($this->worker === null or $this->isFinished()){
throw new \BadMethodCallException("Objects can only be removed from AsyncWorker thread-local storage during task execution");
}
$this->worker->removeFromThreadStore($identifier);
}
/** /**
* Actions to execute when run * Actions to execute when run
*/ */