VERY experimental Nintendo Switch 2 emulator
C++
kernel: clean up waiting implementation
Liamf70a3ada001b
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cppindex cb84c20e37..77356e5924 100644--- a/src/core/hle/kernel/k_process.cpp+++ b/src/core/hle/kernel/k_process.cpp@@ -161,7 +161,7 @@ bool KProcess::ReleaseUserException(KThread* thread) {std::addressof(num_waiters),reinterpret_cast<uintptr_t>(std::addressof(exception_thread)));next != nullptr) {- next->SetState(ThreadState::Runnable);+ next->EndWait(ResultSuccess);}KScheduler::SetSchedulerUpdateNeeded(kernel);diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cppindex c0a091bb6b..e1bdd6c2c1 100644--- a/src/core/hle/kernel/k_thread.cpp+++ b/src/core/hle/kernel/k_thread.cpp@@ -487,9 +487,7 @@ void KThread::Unpin() {// Resume any threads that began waiting on us while we were pinned.for (auto it = pinned_waiter_list.begin(); it != pinned_waiter_list.end(); ++it) {- if (it->GetState() == ThreadState::Waiting) {- it->SetState(ThreadState::Runnable);- }+ it->EndWait(ResultSuccess);}}@@ -884,6 +882,7 @@ void KThread::AddWaiterImpl(KThread* thread) {// Keep track of how many kernel waiters we have.if (IsKernelAddressKey(thread->GetAddressKey())) {ASSERT((num_kernel_waiters++) >= 0);+ KScheduler::SetSchedulerUpdateNeeded(kernel);}// Insert the waiter.@@ -897,6 +896,7 @@ void KThread::RemoveWaiterImpl(KThread* thread) {// Keep track of how many kernel waiters we have.if (IsKernelAddressKey(thread->GetAddressKey())) {ASSERT((num_kernel_waiters--) > 0);+ KScheduler::SetSchedulerUpdateNeeded(kernel);}// Remove the waiter.@@ -972,6 +972,7 @@ KThread* KThread::RemoveWaiterByKey(s32* out_num_waiters, VAddr key) {// Keep track of how many kernel waiters we have.if (IsKernelAddressKey(thread->GetAddressKey())) {ASSERT((num_kernel_waiters--) > 0);+ KScheduler::SetSchedulerUpdateNeeded(kernel);}it = waiter_list.erase(it);