Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

scheduler: Mark parameter of AskForReselectionOrMarkRedundant() as const

Browse source 
This is only compared against, so it can be made const.
This commit is contained in:
Lioncash 2019-10-27 22:39:20 -04:00
parent f19c1a7cda
commit 6c8f28813c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,11 +107,10 @@ bool GlobalScheduler::YieldThread(Thread* yielding_thread) {
const u32 priority = yielding_thread->GetPriority(); const u32 priority = yielding_thread->GetPriority();
// Yield the thread // Yield the thread
ASSERT_MSG(yielding_thread == scheduled_queue[core_id].front(priority), const Thread* const winner = scheduled_queue[core_id].front(priority);
"Thread yielding without being in front"); ASSERT_MSG(yielding_thread == winner, "Thread yielding without being in front");
scheduled_queue[core_id].yield(priority); scheduled_queue[core_id].yield(priority);
Thread* winner = scheduled_queue[core_id].front(priority);
return AskForReselectionOrMarkRedundant(yielding_thread, winner); return AskForReselectionOrMarkRedundant(yielding_thread, winner);
} }
@ -339,7 +338,8 @@ void GlobalScheduler::TransferToCore(u32 priority, s32 destination_core, Thread*
} }
} }
bool GlobalScheduler::AskForReselectionOrMarkRedundant(Thread* current_thread, Thread* winner) { bool GlobalScheduler::AskForReselectionOrMarkRedundant(Thread* current_thread,
const Thread* winner) {
if (current_thread == winner) { if (current_thread == winner) {
current_thread->IncrementYieldCount(); current_thread->IncrementYieldCount();
return true; return true;

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

@ -145,7 +145,7 @@ public:
void Shutdown(); void Shutdown();
private: private:
bool AskForReselectionOrMarkRedundant(Thread* current_thread, Thread* winner); bool AskForReselectionOrMarkRedundant(Thread* current_thread, const Thread* winner);
static constexpr u32 min_regular_priority = 2; static constexpr u32 min_regular_priority = 2;
std::array<Common::MultiLevelQueue<Thread*, THREADPRIO_COUNT>, NUM_CPU_CORES> scheduled_queue; std::array<Common::MultiLevelQueue<Thread*, THREADPRIO_COUNT>, NUM_CPU_CORES> scheduled_queue;