Added /reload command (does not reload source code)

This commit is contained in:
Shoghi Cervantes
2014-04-03 15:49:00 +02:00
parent ee6dc989ce
commit 80f9093875
12 changed files with 210 additions and 70 deletions

View File

@ -33,12 +33,12 @@ abstract class AsyncTask extends \Threaded{
private $result;
public function run(){
$this->synchronized(function(){
$this->result = null;
$this->onRun(\Thread::getCurrentThread());
$this->finished = true;
$this->complete = $this->result === null ? true : false;
});
$this->lock();
$this->result = null;
$this->onRun();
$this->finished = true;
$this->complete = $this->result === null ? true : false;
$this->unlock();
}
/**
@ -82,10 +82,8 @@ abstract class AsyncTask extends \Threaded{
/**
* Actions to execute when run
*
* @param \Thread $thread
*
* @return void
*/
public abstract function onRun(\Thread $thread);
public abstract function onRun();
}

View File

@ -0,0 +1,40 @@
<?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/
*
*
*/
namespace pocketmine\scheduler;
class AsyncWorker extends \Worker{
public $path;
public function start($options = PTHREADS_INHERIT_CLASSES){
$this->path = \pocketmine\PATH;
return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
}
public function run(){
require($this->path . "src/spl/SplClassLoader.php");
$autoloader = new \SplClassLoader();
$autoloader->add("pocketmine", array(
$this->path . "src"
));
$autoloader->register(true);
}
}

View File

@ -33,7 +33,7 @@ class SendUsageTask extends AsyncTask{
$this->data = serialize($data);
}
public function onRun(\Thread $thread){
public function onRun(){
Utils::postURL($this->endpoint, unserialize($this->data));
}

View File

@ -52,7 +52,7 @@ class ServerScheduler{
public function __construct(){
$this->queue = new ReversePriorityQueue();
$this->asyncPool = new \Pool(self::$WORKERS, "Worker");
$this->asyncPool = new \Pool(self::$WORKERS, "pocketmine\\scheduler\\AsyncWorker");
}
/**