summaryrefslogtreecommitdiffstats
path: root/src/core/cpu_manager.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-12-31 08:01:08 +0100
committerbunnei <bunneidev@gmail.com>2021-01-29 06:42:25 +0100
commitc0d3aef28c0a0c68c18de30228f29e30f0e52533 (patch)
tree2f94a5f6e5fec4d288272f9a476ee85a8da3d0ac /src/core/cpu_manager.cpp
parentMerge pull request #5837 from german77/socketstub (diff)
downloadyuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar.gz
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar.bz2
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar.lz
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar.xz
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.tar.zst
yuzu-c0d3aef28c0a0c68c18de30228f29e30f0e52533.zip
Diffstat (limited to '')
-rw-r--r--src/core/cpu_manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index 373395047..122edb588 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -11,9 +11,9 @@
#include "core/core_timing.h"
#include "core/cpu_manager.h"
#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/physical_core.h"
-#include "core/hle/kernel/thread.h"
#include "video_core/gpu.h"
namespace Core {
@@ -147,7 +147,7 @@ void CpuManager::MultiCoreRunSuspendThread() {
while (true) {
auto core = kernel.GetCurrentHostThreadID();
auto& scheduler = *kernel.CurrentScheduler();
- Kernel::Thread* current_thread = scheduler.GetCurrentThread();
+ Kernel::KThread* current_thread = scheduler.GetCurrentThread();
Common::Fiber::YieldTo(current_thread->GetHostContext(), core_data[core].host_context);
ASSERT(scheduler.ContextSwitchPending());
ASSERT(core == kernel.GetCurrentHostThreadID());
@@ -245,7 +245,7 @@ void CpuManager::SingleCoreRunSuspendThread() {
while (true) {
auto core = kernel.GetCurrentHostThreadID();
auto& scheduler = *kernel.CurrentScheduler();
- Kernel::Thread* current_thread = scheduler.GetCurrentThread();
+ Kernel::KThread* current_thread = scheduler.GetCurrentThread();
Common::Fiber::YieldTo(current_thread->GetHostContext(), core_data[0].host_context);
ASSERT(scheduler.ContextSwitchPending());
ASSERT(core == kernel.GetCurrentHostThreadID());
@@ -256,7 +256,7 @@ void CpuManager::SingleCoreRunSuspendThread() {
void CpuManager::PreemptSingleCore(bool from_running_enviroment) {
{
auto& scheduler = system.Kernel().Scheduler(current_core);
- Kernel::Thread* current_thread = scheduler.GetCurrentThread();
+ Kernel::KThread* current_thread = scheduler.GetCurrentThread();
if (idle_count >= 4 || from_running_enviroment) {
if (!from_running_enviroment) {
system.CoreTiming().Idle();