diff options
author | balika011 <balika011@gmail.com> | 2018-10-05 20:51:16 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-10-05 20:53:01 +0200 |
commit | 1a5d6de0d46371b74828a2582506f1b3b2362589 (patch) | |
tree | 4bbb722ae36f032c031018bf8650bcc3f2cd8faf /src | |
parent | Merge pull request #1439 from lioncash/thread (diff) | |
download | yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.gz yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.bz2 yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.lz yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.xz yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.zst yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 354043c53..8e514cf9a 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -169,7 +169,7 @@ void Thread::ResumeFromWait() { next_scheduler->ScheduleThread(this, current_priority); // Change thread's scheduler - scheduler = next_scheduler; + scheduler = next_scheduler.get(); Core::System::GetInstance().CpuCore(processor_id).PrepareReschedule(); } @@ -233,7 +233,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(KernelCore& kernel, std::string name thread->name = std::move(name); thread->callback_handle = kernel.ThreadWakeupCallbackHandleTable().Create(thread).Unwrap(); thread->owner_process = owner_process; - thread->scheduler = Core::System::GetInstance().Scheduler(processor_id); + thread->scheduler = Core::System::GetInstance().Scheduler(processor_id).get(); thread->scheduler->AddThread(thread, priority); thread->tls_address = thread->owner_process->MarkNextAvailableTLSSlotAsUsed(*thread); @@ -400,7 +400,7 @@ void Thread::ChangeCore(u32 core, u64 mask) { next_scheduler->ScheduleThread(this, current_priority); // Change thread's scheduler - scheduler = next_scheduler; + scheduler = next_scheduler.get(); Core::System::GetInstance().CpuCore(processor_id).PrepareReschedule(); } diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index d2b191357..c6ffbd28c 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -419,7 +419,7 @@ private: /// available. In case of a timeout, the object will be nullptr. WakeupCallback wakeup_callback; - std::shared_ptr<Scheduler> scheduler; + Scheduler* scheduler = nullptr; u32 ideal_core{0xFFFFFFFF}; u64 affinity_mask{0x1}; |