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

AsyncTask: TLS now supports storing multiple values (now requires a key/value pair)

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-04-18 18:58:31 +01:00
parent a4c7ec077b
commit 752e398970
9 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,9 +213,10 @@ abstract class AsyncTask extends \Threaded{
* (E.g. a {@link \pocketmine\Level} object is no longer usable because it is unloaded while the AsyncTask is
* executing, or even a plugin might be unloaded).
*
* @param mixed $complexData the data to store
* @param string $key
* @param mixed $complexData the data to store
*/
protected function storeLocal($complexData) : void{
protected function storeLocal(string $key, $complexData) : void{
if(self::$threadLocalStorage === null){
/*
* It's necessary to use an object (not array) here because pthreads is stupid. Non-default array statics
@ -225,7 +226,7 @@ abstract class AsyncTask extends \Threaded{
*/
self::$threadLocalStorage = new \ArrayObject();
}
self::$threadLocalStorage[spl_object_id($this)] = $complexData;
self::$threadLocalStorage[spl_object_id($this)][$key] = $complexData;
}
/**
@ -234,16 +235,19 @@ abstract class AsyncTask extends \Threaded{
* If you used storeLocal(), you can use this on the same thread to fetch data stored. This should be used during
* onProgressUpdate() and onCompletion() to fetch thread-local data stored on the parent thread.
*
* @param string $key
*
* @return mixed
*
* @throws \InvalidArgumentException if no data were stored by this AsyncTask instance.
*/
protected function fetchLocal(){
if(self::$threadLocalStorage === null or !isset(self::$threadLocalStorage[spl_object_id($this)])){
protected function fetchLocal(string $key){
$id = spl_object_id($this);
if(self::$threadLocalStorage === null or !isset(self::$threadLocalStorage[$id][$key])){
throw new \InvalidArgumentException("No matching thread-local data found on this thread");
}
return self::$threadLocalStorage[spl_object_id($this)];
return self::$threadLocalStorage[$id][$key];
}
final public function __destruct(){