summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-02-19 16:46:42 -0500
committerGravatar bunnei2018-02-19 16:46:42 -0500
commit8db80d8389689af5f1b8bf7f8a01f98b9cea4c09 (patch)
tree72bcac878efe95f5e640e833fd2bad2b7e62e3ce
parentkernel: Use Scheduler class for threading. (diff)
downloadyuzu-8db80d8389689af5f1b8bf7f8a01f98b9cea4c09.tar.gz
yuzu-8db80d8389689af5f1b8bf7f8a01f98b9cea4c09.tar.xz
yuzu-8db80d8389689af5f1b8bf7f8a01f98b9cea4c09.zip
scheduler: Cleanup based on PR feedback.
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp2
-rw-r--r--src/core/hle/kernel/scheduler.cpp2
-rw-r--r--src/core/hle/kernel/scheduler.h5
3 files changed, 4 insertions, 5 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index cef697dfe..8c5dd3761 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -154,7 +154,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
154 break; 154 break;
155 } 155 }
156 156
157 scheduler = std::make_unique<Kernel::Scheduler>(cpu_core); 157 scheduler = std::make_unique<Kernel::Scheduler>(cpu_core.get());
158 gpu_core = std::make_unique<Tegra::GPU>(); 158 gpu_core = std::make_unique<Tegra::GPU>();
159 159
160 telemetry_session = std::make_unique<Core::TelemetrySession>(); 160 telemetry_session = std::make_unique<Core::TelemetrySession>();
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index 2fe0d5a38..235068b22 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -8,7 +8,7 @@
8 8
9namespace Kernel { 9namespace Kernel {
10 10
11Scheduler::Scheduler(std::shared_ptr<ARM_Interface> cpu_core) : cpu_core(cpu_core) {} 11Scheduler::Scheduler(ARM_Interface* cpu_core) : cpu_core(cpu_core) {}
12 12
13Scheduler::~Scheduler() { 13Scheduler::~Scheduler() {
14 for (auto& thread : thread_list) { 14 for (auto& thread : thread_list) {
diff --git a/src/core/hle/kernel/scheduler.h b/src/core/hle/kernel/scheduler.h
index 72e658ec6..27d0247d6 100644
--- a/src/core/hle/kernel/scheduler.h
+++ b/src/core/hle/kernel/scheduler.h
@@ -4,7 +4,6 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <memory>
8#include <vector> 7#include <vector>
9#include "common/common_types.h" 8#include "common/common_types.h"
10#include "common/thread_queue_list.h" 9#include "common/thread_queue_list.h"
@@ -15,7 +14,7 @@ namespace Kernel {
15 14
16class Scheduler final { 15class Scheduler final {
17public: 16public:
18 Scheduler(std::shared_ptr<ARM_Interface> cpu_core); 17 explicit Scheduler(ARM_Interface* cpu_core);
19 ~Scheduler(); 18 ~Scheduler();
20 19
21 /// Returns whether there are any threads that are ready to run. 20 /// Returns whether there are any threads that are ready to run.
@@ -68,7 +67,7 @@ private:
68 67
69 SharedPtr<Thread> current_thread = nullptr; 68 SharedPtr<Thread> current_thread = nullptr;
70 69
71 std::shared_ptr<ARM_Interface> cpu_core; 70 ARM_Interface* cpu_core;
72}; 71};
73 72
74} // namespace Kernel 73} // namespace Kernel