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

Clean up Thread/Worker quit()

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-07-26 14:17:01 +01:00
parent 695793795e
commit c684f99cc4
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/Thread.php
View File

@ -83,12 +83,9 @@ abstract class Thread extends \Thread{
public function quit(){ public function quit(){
$this->isKilled = true; $this->isKilled = true;
$this->notify();
if(!$this->isJoined()){ if(!$this->isJoined()){
if(!$this->isTerminated()){ $this->notify();
$this->join(); $this->join();
}
} }
ThreadManager::getInstance()->remove($this); ThreadManager::getInstance()->remove($this);

10
src/pocketmine/Worker.php
View File

@ -83,16 +83,10 @@ abstract class Worker extends \Worker{
public function quit(){ public function quit(){
$this->isKilled = true; $this->isKilled = true;
$this->notify();
if($this->isRunning()){ if($this->isRunning()){
$this->shutdown(); while($this->unstack() !== null);
$this->notify(); $this->notify();
$this->unstack(); $this->shutdown();
}elseif(!$this->isJoined()){
if(!$this->isTerminated()){
$this->join();
}
} }
ThreadManager::getInstance()->remove($this); ThreadManager::getInstance()->remove($this);