GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 07:05:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty core queues in Scheduler::UpdatePriority

Browse Source 
If the queue is empty then begin() == end() leading to
ArmPreemptionTimer being called on an unscheduled thread.
This commit is contained in:
Billy Laws 2021-06-18 17:22:04 +01:00
parent d57883705d
commit b87f451746
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/cpp/skyline/kernel/scheduler.cpp
View File

@ -258,6 +258,9 @@ namespace skyline::kernel {
std::unique_lock coreLock(core->mutex); std::unique_lock coreLock(core->mutex);
auto currentIt{std::find(core->queue.begin(), core->queue.end(), thread)}, nextIt{std::next(currentIt)}; auto currentIt{std::find(core->queue.begin(), core->queue.end(), thread)}, nextIt{std::next(currentIt)};
if (currentIt == core->queue.end())
return;
if (currentIt == core->queue.begin()) { if (currentIt == core->queue.begin()) {
// Alternatively, if it's currently running then we'd just want to yield if there's a higher priority thread to run instead // Alternatively, if it's currently running then we'd just want to yield if there's a higher priority thread to run instead
if (nextIt != core->queue.end() && (*nextIt)->priority < thread->priority) { if (nextIt != core->queue.end() && (*nextIt)->priority < thread->priority) {
@ -272,7 +275,7 @@ namespace skyline::kernel {
// If the thread no longer needs to be preempted due to its new priority then disarm its preemption timer // If the thread no longer needs to be preempted due to its new priority then disarm its preemption timer
thread->DisarmPreemptionTimer(); thread->DisarmPreemptionTimer();
} }
} else if (currentIt != core->queue.end() && (thread->priority < (*std::prev(currentIt))->priority || (nextIt != core->queue.end() && thread->priority > (*nextIt)->priority))) { } else if (thread->priority < (*std::prev(currentIt))->priority || (nextIt != core->queue.end() && thread->priority > (*nextIt)->priority)) {
// If the thread is in the queue and it's position is affected by the priority change then need to remove and re-insert the thread // If the thread is in the queue and it's position is affected by the priority change then need to remove and re-insert the thread
core->queue.erase(currentIt); core->queue.erase(currentIt);