artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Scheduler: Corrections to YieldAndBalanceLoad and Yield bombing protection.

Browse source
This commit is contained in:
Fernando Sahmkow 2019-09-10 15:26:24 -04:00 committed by FernandoS27
parent b49c0dab87
commit 2d382de6fa
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/kernel/scheduler.cpp
View file

@ -165,6 +165,7 @@ bool GlobalScheduler::YieldThreadAndBalanceLoad(Thread* yielding_thread) {
continue; continue;
} }
} }
}
if (next_thread->GetLastRunningTicks() >= thread->GetLastRunningTicks() || if (next_thread->GetLastRunningTicks() >= thread->GetLastRunningTicks() ||
next_thread->GetPriority() < thread->GetPriority()) { next_thread->GetPriority() < thread->GetPriority()) {
if (thread->GetPriority() <= priority) { if (thread->GetPriority() <= priority) {
@ -173,7 +174,6 @@ bool GlobalScheduler::YieldThreadAndBalanceLoad(Thread* yielding_thread) {
} }
} }
} }
}
if (winner != nullptr) { if (winner != nullptr) {
if (winner != yielding_thread) { if (winner != yielding_thread) {
@ -240,7 +240,7 @@ bool GlobalScheduler::YieldThreadAndWaitForLoadBalancing(Thread* yielding_thread
void GlobalScheduler::PreemptThreads() { void GlobalScheduler::PreemptThreads() {
for (std::size_t core_id = 0; core_id < NUM_CPU_CORES; core_id++) { for (std::size_t core_id = 0; core_id < NUM_CPU_CORES; core_id++) {
const u64 priority = preemption_priorities[core_id]; const u32 priority = preemption_priorities[core_id];
if (scheduled_queue[core_id].size(priority) > 1) { if (scheduled_queue[core_id].size(priority) > 1) {
scheduled_queue[core_id].yield(priority); scheduled_queue[core_id].yield(priority);
reselection_pending.store(true, std::memory_order_release); reselection_pending.store(true, std::memory_order_release);

2
src/core/hle/kernel/scheduler.h
View file

@ -155,7 +155,7 @@ private:
std::array<Common::MultiLevelQueue<Thread*, THREADPRIO_COUNT>, NUM_CPU_CORES> suggested_queue; std::array<Common::MultiLevelQueue<Thread*, THREADPRIO_COUNT>, NUM_CPU_CORES> suggested_queue;
std::atomic<bool> reselection_pending; std::atomic<bool> reselection_pending;
std::array<u64, NUM_CPU_CORES> preemption_priorities = {59, 59, 59, 62}; std::array<u32, NUM_CPU_CORES> preemption_priorities = {59, 59, 59, 62};
/// Lists all thread ids that aren't deleted/etc. /// Lists all thread ids that aren't deleted/etc.
std::vector<SharedPtr<Thread>> thread_list; std::vector<SharedPtr<Thread>> thread_list;