Removed pocketmine subdirectory, map PSR-4 style

src/thread/CommonThreadPartsTrait.php

@@ -0,0 +1,82 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\thread;
+
+use pocketmine\Server;
+use function error_reporting;
+
+trait CommonThreadPartsTrait{
+	/** @var \ClassLoader|null */
+	protected $classLoader;
+	/** @var string|null */
+	protected $composerAutoloaderPath;
+
+	protected $isKilled = false;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(?\ClassLoader $loader = null) : void{
+		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
+
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	/**
+	 * Registers the class loader for this thread.
+	 *
+	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
+	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
+	 * (unless you are using a custom autoloader).
+	 */
+	public function registerClassLoader() : void{
+		if($this->composerAutoloaderPath !== null){
+			require $this->composerAutoloaderPath;
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(false);
+		}
+	}
+
+	final public function run() : void{
+		error_reporting(-1);
+		$this->registerClassLoader();
+		//set this after the autoloader is registered
+		\ErrorUtils::setErrorExceptionHandler();
+		$this->onRun();
+	}
+
+	/**
+	 * Runs code on the thread.
+	 */
+	abstract protected function onRun() : void;
+
+	public function getThreadName() : string{
+		return (new \ReflectionClass($this))->getShortName();
+	}
+}

src/thread/Thread.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\thread;
+
+/**
+ * This class must be extended by all custom threading classes
+ */
+abstract class Thread extends \Thread{
+	use CommonThreadPartsTrait;
+
+	public function start(?int $options = \PTHREADS_INHERIT_ALL) : bool{
+		//this is intentionally not traitified
+		ThreadManager::getInstance()->add($this);
+
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
+		}
+		return parent::start($options);
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit() : void{
+		$this->isKilled = true;
+
+		if(!$this->isJoined()){
+			$this->notify();
+			$this->join();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+}

src/thread/ThreadManager.php

@@ -0,0 +1,92 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\thread;
+
+use function spl_object_id;
+
+class ThreadManager extends \Volatile{
+
+	/** @var ThreadManager */
+	private static $instance = null;
+
+	public static function init() : void{
+		self::$instance = new ThreadManager();
+	}
+
+	/**
+	 * @return ThreadManager
+	 */
+	public static function getInstance() : ThreadManager{
+		return self::$instance;
+	}
+
+	/**
+	 * @param Worker|Thread $thread
+	 */
+	public function add($thread) : void{
+		if($thread instanceof Thread or $thread instanceof Worker){
+			$this->{spl_object_id($thread)} = $thread;
+		}
+	}
+
+	/**
+	 * @param Worker|Thread $thread
+	 */
+	public function remove($thread) : void{
+		if($thread instanceof Thread or $thread instanceof Worker){
+			unset($this->{spl_object_id($thread)});
+		}
+	}
+
+	/**
+	 * @return Worker[]|Thread[]
+	 */
+	public function getAll() : array{
+		$array = [];
+		foreach($this as $key => $thread){
+			$array[$key] = $thread;
+		}
+
+		return $array;
+	}
+
+	public function stopAll() : int{
+		$logger = \GlobalLogger::get();
+
+		$erroredThreads = 0;
+
+		foreach($this->getAll() as $thread){
+			$logger->debug("Stopping " . $thread->getThreadName() . " thread");
+			try{
+				$thread->quit();
+				$logger->debug($thread->getThreadName() . " thread stopped successfully.");
+			}catch(\ThreadException $e){
+				++$erroredThreads;
+				$logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage());
+			}
+		}
+
+		return $erroredThreads;
+	}
+}

src/thread/Worker.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\thread;
+
+/**
+ * This class must be extended by all custom threading classes
+ */
+abstract class Worker extends \Worker{
+	use CommonThreadPartsTrait;
+
+	public function start(?int $options = \PTHREADS_INHERIT_ALL) : bool{
+		//this is intentionally not traitified
+		ThreadManager::getInstance()->add($this);
+
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
+		}
+		return parent::start($options);
+	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit() : void{
+		$this->isKilled = true;
+
+		if($this->isRunning()){
+			while($this->unstack() !== null);
+			$this->notify();
+			$this->shutdown();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+}