summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-18 03:48:14 +0100
committerbunnei <bunneidev@gmail.com>2022-01-21 02:08:00 +0100
commit46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1 (patch)
tree5d1a3174fc8285e9388277e7e7d877de0425aa82 /src
parenthle: kernel: service_thread: Ensure dummy thread is closed & destroyed on thread exit. (diff)
downloadyuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar.gz
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar.bz2
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar.lz
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar.xz
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.tar.zst
yuzu-46a620f9d7c0fa2a4f1143ebf28bba4fee12d1a1.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/k_scheduler.cpp1
-rw-r--r--src/core/hle/kernel/k_thread.cpp5
-rw-r--r--src/core/hle/kernel/k_thread.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp
index 5d39a1d4a..1b2a01869 100644
--- a/src/core/hle/kernel/k_scheduler.cpp
+++ b/src/core/hle/kernel/k_scheduler.cpp
@@ -741,6 +741,7 @@ void KScheduler::ScheduleImpl() {
// We never want to schedule a dummy thread, as these are only used by host threads for locking.
if (next_thread->GetThreadType() == ThreadType::Dummy) {
+ ASSERT_MSG(false, "Dummy threads should never be scheduled!");
next_thread = idle_thread;
}
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp
index 35c4a7581..a599723e6 100644
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@@ -106,7 +106,7 @@ KThread::~KThread() = default;
ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio,
s32 virt_core, KProcess* owner, ThreadType type) {
// Assert parameters are valid.
- ASSERT((type == ThreadType::Main) ||
+ ASSERT((type == ThreadType::Main) || (type == ThreadType::Dummy) ||
(Svc::HighestThreadPriority <= prio && prio <= Svc::LowestThreadPriority));
ASSERT((owner != nullptr) || (type != ThreadType::User));
ASSERT(0 <= virt_core && virt_core < static_cast<s32>(Common::BitSize<u64>()));
@@ -262,7 +262,7 @@ ResultCode KThread::InitializeThread(KThread* thread, KThreadFunction func, uint
}
ResultCode KThread::InitializeDummyThread(KThread* thread) {
- return thread->Initialize({}, {}, {}, DefaultThreadPriority, 3, {}, ThreadType::Dummy);
+ return thread->Initialize({}, {}, {}, DummyThreadPriority, 3, {}, ThreadType::Dummy);
}
ResultCode KThread::InitializeIdleThread(Core::System& system, KThread* thread, s32 virt_core) {
@@ -1099,6 +1099,7 @@ void KThread::EndWait(ResultCode wait_result_) {
// Dummy threads are just used by host threads for locking, and will never have a wait_queue.
if (thread_type == ThreadType::Dummy) {
+ ASSERT_MSG(false, "Dummy threads should never call EndWait!");
return;
}
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index 86d4b7c55..77b53a198 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -112,6 +112,7 @@ private:
public:
static constexpr s32 DefaultThreadPriority = 44;
static constexpr s32 IdleThreadPriority = Svc::LowestThreadPriority + 1;
+ static constexpr s32 DummyThreadPriority = Svc::LowestThreadPriority + 2;
explicit KThread(KernelCore& kernel_);
~KThread() override;