mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

AsyncPool: make collectTasks() return value more accurate

Browse Source 
during onCompletion() anything may happen, including scheduling new tasks, which the previous code did not account for.
This commit is contained in:
Dylan K. Taylor 2021-06-11 18:27:43 +01:00
parent 532d57eec7
commit f245147c11
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scheduler/AsyncPool.php
View File

@ -233,11 +233,17 @@ class AsyncPool{
* @return bool whether there are tasks left to be collected * @return bool whether there are tasks left to be collected
*/ */
public function collectTasks() : bool{ public function collectTasks() : bool{
$more = false;
foreach($this->taskQueues as $worker => $queue){ foreach($this->taskQueues as $worker => $queue){
$more = $this->collectTasksFromWorker($worker) || $more; $this->collectTasksFromWorker($worker);
} }
return $more;
//we check this in a second loop, because task collection could have caused new tasks to be added to the queues
foreach($this->taskQueues as $queue){
if(!$queue->isEmpty()){
return true;
}
}
return false;
} }
public function collectTasksFromWorker(int $worker) : bool{ public function collectTasksFromWorker(int $worker) : bool{