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

AsyncTask: strip out task cancellation functionality

Browse Source 
closes #5854

Cancelling task runs doesn't make any sense.

- It breaks sequential task execution - later tasks might depend on state from earlier tasks
- It doesn't actually cancel the task - at best, it prevents it from running, but cannot interrupt it (though interrupting a task does not make sense either)

We don't use this "feature" in the core anymore since 22b5e5db5e, as this was causing unexpected behaviour for plugins anyway, along with the occasional shutdown crash due to inconsistent worker states.
This commit is contained in:
Dylan K. Taylor
2023-07-18 12:45:30 +01:00
parent 90520c8962
commit a74ab756bd
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scheduler/AsyncPool.php
View File

@ -259,7 +259,7 @@ class AsyncPool{
if($task->isTerminated()){ if($task->isTerminated()){
$this->checkCrashedWorker($worker, $task); $this->checkCrashedWorker($worker, $task);
throw new AssumptionFailedError("checkCrashedWorker() should have thrown an exception, making this unreachable"); throw new AssumptionFailedError("checkCrashedWorker() should have thrown an exception, making this unreachable");
}elseif(!$task->hasCancelledRun()){ }else{
/* /*
* It's possible for a task to submit a progress update and then finish before the progress * It's possible for a task to submit a progress update and then finish before the progress
* update is detected by the parent thread, so here we consume any missed updates. * update is detected by the parent thread, so here we consume any missed updates.

17
src/scheduler/AsyncTask.php
View File

@ -72,17 +72,14 @@ abstract class AsyncTask extends Runnable{
private ?ThreadSafeArray $progressUpdates = null; private ?ThreadSafeArray $progressUpdates = null;
private ThreadSafe|string|int|bool|null|float $result = null; private ThreadSafe|string|int|bool|null|float $result = null;
private bool $cancelRun = false;
private bool $submitted = false;
private bool $submitted = false;
private bool $finished = false; private bool $finished = false;
public function run() : void{ public function run() : void{
$this->result = null; $this->result = null;
if(!$this->cancelRun){ $this->onRun();
$this->onRun();
}
$this->finished = true; $this->finished = true;
$worker = NativeThread::getCurrentThread(); $worker = NativeThread::getCurrentThread();
@ -123,12 +120,18 @@ abstract class AsyncTask extends Runnable{
$this->result = is_scalar($result) || is_null($result) || $result instanceof ThreadSafe ? $result : new NonThreadSafeValue($result); $this->result = is_scalar($result) || is_null($result) || $result instanceof ThreadSafe ? $result : new NonThreadSafeValue($result);
} }
/**
* @deprecated
*/
public function cancelRun() : void{ public function cancelRun() : void{
$this->cancelRun = true; //NOOP
} }
/**
* @deprecated
*/
public function hasCancelledRun() : bool{ public function hasCancelledRun() : bool{
return $this->cancelRun; return false;
} }
public function setSubmitted() : void{ public function setSubmitted() : void{