summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/scheduler.cpp
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2020-02-13 22:04:10 -0400
committerGravatar FernandoS272020-02-22 11:18:06 -0400
commit0728dfef84ded5e68bdb3b0781ea00ca7cc85659 (patch)
tree2f0746f6070e5e27eaa15612458acbd33a911d6a /src/core/hle/kernel/scheduler.cpp
parentMerge pull request #3444 from bunnei/linux-audio-fix (diff)
downloadyuzu-0728dfef84ded5e68bdb3b0781ea00ca7cc85659.tar.gz
yuzu-0728dfef84ded5e68bdb3b0781ea00ca7cc85659.tar.xz
yuzu-0728dfef84ded5e68bdb3b0781ea00ca7cc85659.zip
Kernel: Make global scheduler depend on KernelCore
Diffstat (limited to 'src/core/hle/kernel/scheduler.cpp')
-rw-r--r--src/core/hle/kernel/scheduler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index 86f1421bf..118c1aa95 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -21,7 +21,7 @@
21 21
22namespace Kernel { 22namespace Kernel {
23 23
24GlobalScheduler::GlobalScheduler(Core::System& system) : system{system} {} 24GlobalScheduler::GlobalScheduler(KernelCore& kernel) : kernel{kernel} {}
25 25
26GlobalScheduler::~GlobalScheduler() = default; 26GlobalScheduler::~GlobalScheduler() = default;
27 27
@@ -35,7 +35,7 @@ void GlobalScheduler::RemoveThread(std::shared_ptr<Thread> thread) {
35} 35}
36 36
37void GlobalScheduler::UnloadThread(std::size_t core) { 37void GlobalScheduler::UnloadThread(std::size_t core) {
38 Scheduler& sched = system.Scheduler(core); 38 Scheduler& sched = kernel.Scheduler(core);
39 sched.UnloadThread(); 39 sched.UnloadThread();
40} 40}
41 41
@@ -50,7 +50,7 @@ void GlobalScheduler::SelectThread(std::size_t core) {
50 sched.is_context_switch_pending = sched.selected_thread != sched.current_thread; 50 sched.is_context_switch_pending = sched.selected_thread != sched.current_thread;
51 std::atomic_thread_fence(std::memory_order_seq_cst); 51 std::atomic_thread_fence(std::memory_order_seq_cst);
52 }; 52 };
53 Scheduler& sched = system.Scheduler(core); 53 Scheduler& sched = kernel.Scheduler(core);
54 Thread* current_thread = nullptr; 54 Thread* current_thread = nullptr;
55 // Step 1: Get top thread in schedule queue. 55 // Step 1: Get top thread in schedule queue.
56 current_thread = scheduled_queue[core].empty() ? nullptr : scheduled_queue[core].front(); 56 current_thread = scheduled_queue[core].empty() ? nullptr : scheduled_queue[core].front();