Added Asynchronous tasks, usage sending

This commit is contained in:
Shoghi Cervantes
2014-04-02 20:20:14 +02:00
parent 11356b68ba
commit 0f42cd9243
4 changed files with 207 additions and 30 deletions

View File

@ -0,0 +1,91 @@
<?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
*
*
*/
namespace pocketmine\scheduler;
/**
* Class used to run async tasks in other threads.
*
* WARNING: Do not call PocketMine-MP API methods from other Threads!!
*/
abstract class AsyncTask extends \Threaded{
private $complete;
private $finished;
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;
});
}
/**
* @return bool
*/
public function isCompleted(){
return $this->complete === true;
}
/**
* @return mixed
*/
public function getResult(){
return $this->synchronized(function(){
$this->finished = true;
return @unserialize($this->result);
});
}
/**
* @return bool
*/
public function hasResult(){
return $this->result !== null;
}
/**
* @param mixed $result
*/
public function setResult($result){
$this->result = @serialize($result);
}
/**
* @return bool
*/
public function isFinished(){
return $this->finished === true;
}
/**
* Actions to execute when run
*
* @param \Thread $thread
*
* @return void
*/
public abstract function onRun(\Thread $thread);
}

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
*
*
*/
namespace pocketmine\scheduler;
use pocketmine\utils\Utils;
class SendUsageTask extends AsyncTask{
public $endpoint;
public $data;
public function __construct($endpoint, array $data){
$this->endpoint = $endpoint;
$this->data = serialize($data);
}
public function onRun(\Thread $thread){
Utils::postURL($this->endpoint, unserialize($this->data));
}
}

View File

@ -28,7 +28,7 @@ use pocketmine\plugin\Plugin;
use pocketmine\utils\ReversePriorityQueue;
class ServerScheduler{
protected static $WORKERS = 3;
/**
* @var ReversePriorityQueue<Task>
*/
@ -39,6 +39,11 @@ class ServerScheduler{
*/
protected $tasks = array();
/** @var \Pool */
protected $asyncPool;
protected $asyncTasks = 0;
/** @var int */
private $ids = 1;
@ -47,6 +52,7 @@ class ServerScheduler{
public function __construct(){
$this->queue = new ReversePriorityQueue();
$this->asyncPool = new \Pool(self::$WORKERS, "Worker");
}
/**
@ -58,6 +64,19 @@ class ServerScheduler{
return $this->addTask($task, -1, -1);
}
/**
* Submits a asynchronous task to the Pool
* If the AsyncTask sets a result, you have to get it so it can be deleted
*
* @param AsyncTask $task
*
* @return void
*/
public function scheduleAsyncTask(AsyncTask $task){
$this->asyncPool->submit($task);
++$this->asyncTasks;
}
/**
* @param Task $task
* @param int $delay
@ -116,6 +135,8 @@ class ServerScheduler{
$task->cancel();
}
$this->tasks = array();
$this->asyncPool->shutdown();
$this->asyncTasks = 0;
}
/**
@ -182,6 +203,16 @@ class ServerScheduler{
unset($this->tasks[$task->getTaskId()]);
}
}
if($this->asyncTasks > 0){ //Garbage collector
$this->asyncPool->collect(function(AsyncTask $task){
if($task->isCompleted() or ($task->isFinished() and !$task->hasResult())){
--$this->asyncTasks;
return true;
}
return false;
});
}
}
private function isReady($currentTicks){