diff options
author | Lioncash <mathew1800@gmail.com> | 2019-10-28 03:34:28 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-10-28 03:44:52 +0100 |
commit | f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea (patch) | |
tree | b6a60caf9bfd1c89695b880217b5b9fa556e7397 | |
parent | scheduler: Initialize class members directly where applicable (diff) | |
download | yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar.gz yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar.bz2 yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar.lz yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar.xz yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.tar.zst yuzu-f19c1a7cda321c96f6314acf8a9b5137bc3fe1ea.zip |
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 8353308aa..9a38fa50c 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -251,7 +251,7 @@ void GlobalScheduler::PreemptThreads() { if (winner->IsRunning()) { UnloadThread(winner->GetProcessorID()); } - TransferToCore(winner->GetPriority(), core_id, winner); + TransferToCore(winner->GetPriority(), s32(core_id), winner); current_thread = winner->GetPriority() <= current_thread->GetPriority() ? winner : current_thread; } @@ -284,7 +284,7 @@ void GlobalScheduler::PreemptThreads() { if (winner->IsRunning()) { UnloadThread(winner->GetProcessorID()); } - TransferToCore(winner->GetPriority(), core_id, winner); + TransferToCore(winner->GetPriority(), s32(core_id), winner); current_thread = winner; } } @@ -302,12 +302,12 @@ void GlobalScheduler::Unsuggest(u32 priority, u32 core, Thread* thread) { } void GlobalScheduler::Schedule(u32 priority, u32 core, Thread* thread) { - ASSERT_MSG(thread->GetProcessorID() == core, "Thread must be assigned to this core."); + ASSERT_MSG(thread->GetProcessorID() == s32(core), "Thread must be assigned to this core."); scheduled_queue[core].add(thread, priority); } void GlobalScheduler::SchedulePrepend(u32 priority, u32 core, Thread* thread) { - ASSERT_MSG(thread->GetProcessorID() == core, "Thread must be assigned to this core."); + ASSERT_MSG(thread->GetProcessorID() == s32(core), "Thread must be assigned to this core."); scheduled_queue[core].add(thread, priority, false); } @@ -439,7 +439,7 @@ void Scheduler::SwitchContext() { // Load context of new thread if (new_thread) { - ASSERT_MSG(new_thread->GetProcessorID() == this->core_id, + ASSERT_MSG(new_thread->GetProcessorID() == s32(this->core_id), "Thread must be assigned to this core."); ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready, "Thread must be ready to become running."); |