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

Fixed AsyncTask publishProgress() race condition on task exit

Browse Source 
It's possible for a progress update to be lost due to the task finishing before the main thread found the progress update.
This commit is contained in:
Dylan K. Taylor
2018-10-10 13:38:04 +01:00
parent 32836cbfb8
commit 2858db430e
3 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/scheduler/AsyncPool.php
View File

@ -289,12 +289,20 @@ class AsyncPool{
*/
public function collectTasks() : void{
foreach($this->tasks as $task){
if(!$task->isGarbage()){
$task->checkProgressUpdates($this->server);
}
$task->checkProgressUpdates($this->server);
if($task->isGarbage() and !$task->isRunning() and !$task->isCrashed()){
if(!$task->hasCancelledRun()){
try{
/*
* 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.
*
* When this happens, it's possible for a progress update to arrive between the previous
* checkProgressUpdates() call and the next isGarbage() call, causing progress updates to be
* lost. Thus, it's necessary to do one last check here to make sure all progress updates have
* been consumed before completing.
*/
$task->checkProgressUpdates($this->server);
$task->onCompletion($this->server);
if($task->removeDanglingStoredObjects()){
$this->logger->notice("AsyncTask " . get_class($task) . " stored local complex data but did not remove them after completion");