diff options
author | Luke Street <luke.street@encounterpc.com> | 2018-12-03 18:25:27 +0100 |
---|---|---|
committer | Luke Street <luke.street@encounterpc.com> | 2018-12-04 07:23:50 +0100 |
commit | 3e75175d0242090902e4b383086e3f5ac6cf3f73 (patch) | |
tree | c6ff5eb9787f21284a5748ad210c866d32e04bcd /src/core/hle/kernel/thread.cpp | |
parent | Merge pull request #1852 from VPeruS/fix-format-string (diff) | |
download | yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar.gz yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar.bz2 yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar.lz yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar.xz yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.tar.zst yuzu-3e75175d0242090902e4b383086e3f5ac6cf3f73.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 4ffb76818..748c45dd7 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -50,7 +50,7 @@ void Thread::Stop() { // Clean up thread from ready queue // This is only needed when the thread is terminated forcefully (SVC TerminateProcess) - if (status == ThreadStatus::Ready) { + if (status == ThreadStatus::Ready || status == ThreadStatus::Paused) { scheduler->UnscheduleThread(this, current_priority); } @@ -140,6 +140,11 @@ void Thread::ResumeFromWait() { wakeup_callback = nullptr; + if (activity == ThreadActivity::Paused) { + status = ThreadStatus::Paused; + return; + } + status = ThreadStatus::Ready; ChangeScheduler(); @@ -388,6 +393,23 @@ bool Thread::InvokeWakeupCallback(ThreadWakeupReason reason, SharedPtr<Thread> t return wakeup_callback(reason, std::move(thread), std::move(object), index); } +void Thread::SetActivity(ThreadActivity value) { + activity = value; + + if (value == ThreadActivity::Paused) { + // Set status if not waiting + if (status == ThreadStatus::Ready) { + status = ThreadStatus::Paused; + } else if (status == ThreadStatus::Running) { + status = ThreadStatus::Paused; + Core::System::GetInstance().CpuCore(processor_id).PrepareReschedule(); + } + } else if (status == ThreadStatus::Paused) { + // Ready to reschedule + ResumeFromWait(); + } +} + //////////////////////////////////////////////////////////////////////////////////////////////////// /** |