summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-11-28 09:40:25 +0100
committerbunnei <bunneidev@gmail.com>2021-12-07 01:39:18 +0100
commit42697527ba6e981237f03f850826b5e722917414 (patch)
tree0b743ed66c4fbf306b395a83098fbf2c19fcab3a /src/core
parenthle: kernel: svc: Fix deadlock that can occur with single core. (diff)
downloadyuzu-42697527ba6e981237f03f850826b5e722917414.tar
yuzu-42697527ba6e981237f03f850826b5e722917414.tar.gz
yuzu-42697527ba6e981237f03f850826b5e722917414.tar.bz2
yuzu-42697527ba6e981237f03f850826b5e722917414.tar.lz
yuzu-42697527ba6e981237f03f850826b5e722917414.tar.xz
yuzu-42697527ba6e981237f03f850826b5e722917414.tar.zst
yuzu-42697527ba6e981237f03f850826b5e722917414.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_thread.cpp22
-rw-r--r--src/core/hle/kernel/k_thread.h8
2 files changed, 13 insertions, 17 deletions
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp
index 334487d8a..245437387 100644
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@@ -161,7 +161,7 @@ ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_s
base_priority = prio;
// Initialize sleeping queue.
- sleeping_queue = nullptr;
+ wait_queue = nullptr;
// Set suspend flags.
suspend_request_flags = 0;
@@ -333,7 +333,7 @@ void KThread::OnTimer() {
// If we're waiting, cancel the wait.
if (GetState() == ThreadState::Waiting) {
- sleeping_queue->CancelWait(this, ResultTimedOut, false);
+ wait_queue->CancelWait(this, ResultTimedOut, false);
}
}
@@ -570,7 +570,7 @@ ResultCode KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) {
}
// Update the pinned waiter list.
- ThreadQueueImplForKThreadSetProperty wait_queue(kernel, std::addressof(pinned_waiter_list));
+ ThreadQueueImplForKThreadSetProperty wait_queue_(kernel, std::addressof(pinned_waiter_list));
{
bool retry_update{};
do {
@@ -605,7 +605,7 @@ ResultCode KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) {
// Wait until the thread isn't pinned any more.
pinned_waiter_list.push_back(GetCurrentThread(kernel));
- GetCurrentThread(kernel).BeginWait(std::addressof(wait_queue));
+ GetCurrentThread(kernel).BeginWait(std::addressof(wait_queue_));
} else {
// If the thread isn't pinned, release the scheduler lock and retry until it's
// not current.
@@ -663,7 +663,7 @@ void KThread::WaitCancel() {
// Check if we're waiting and cancellable.
if (this->GetState() == ThreadState::Waiting && cancellable) {
wait_cancelled = false;
- sleeping_queue->CancelWait(this, ResultCancelled, true);
+ wait_queue->CancelWait(this, ResultCancelled, true);
} else {
// Otherwise, note that we cancelled a wait.
wait_cancelled = true;
@@ -1002,7 +1002,7 @@ ResultCode KThread::Sleep(s64 timeout) {
ASSERT(this == GetCurrentThreadPointer(kernel));
ASSERT(timeout > 0);
- ThreadQueueImplForKThreadSleep wait_queue(kernel);
+ ThreadQueueImplForKThreadSleep wait_queue_(kernel);
{
// Setup the scheduling lock and sleep.
KScopedSchedulerLockAndSleep slp(kernel, this, timeout);
@@ -1014,7 +1014,7 @@ ResultCode KThread::Sleep(s64 timeout) {
}
// Wait for the sleep to end.
- this->BeginWait(std::addressof(wait_queue));
+ this->BeginWait(std::addressof(wait_queue_));
SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Sleep);
}
@@ -1026,7 +1026,7 @@ void KThread::BeginWait(KThreadQueue* queue) {
SetState(ThreadState::Waiting);
// Set our wait queue.
- sleeping_queue = queue;
+ wait_queue = queue;
}
void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, ResultCode wait_result_) {
@@ -1035,7 +1035,7 @@ void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, ResultCod
// If we're waiting, notify our queue that we're available.
if (GetState() == ThreadState::Waiting) {
- sleeping_queue->NotifyAvailable(this, signaled_object, wait_result_);
+ wait_queue->NotifyAvailable(this, signaled_object, wait_result_);
}
}
@@ -1045,7 +1045,7 @@ void KThread::EndWait(ResultCode wait_result_) {
// If we're waiting, notify our queue that we're available.
if (GetState() == ThreadState::Waiting) {
- sleeping_queue->EndWait(this, wait_result_);
+ wait_queue->EndWait(this, wait_result_);
}
}
@@ -1055,7 +1055,7 @@ void KThread::CancelWait(ResultCode wait_result_, bool cancel_timer_task) {
// If we're waiting, notify our queue that we're available.
if (GetState() == ThreadState::Waiting) {
- sleeping_queue->CancelWait(this, wait_result_, cancel_timer_task);
+ wait_queue->CancelWait(this, wait_result_, cancel_timer_task);
}
}
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index 94b87bef1..c8a08bd71 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -453,10 +453,6 @@ public:
return per_core_priority_queue_entry[core];
}
- void SetSleepingQueue(KThreadQueue* q) {
- sleeping_queue = q;
- }
-
[[nodiscard]] bool IsKernelThread() const {
return GetActiveCore() == 3;
}
@@ -604,7 +600,7 @@ public:
}
void ClearWaitQueue() {
- sleeping_queue = nullptr;
+ wait_queue = nullptr;
}
void BeginWait(KThreadQueue* queue);
@@ -715,7 +711,7 @@ private:
s64 schedule_count{};
s64 last_scheduled_tick{};
std::array<QueueEntry, Core::Hardware::NUM_CPU_CORES> per_core_priority_queue_entry{};
- KThreadQueue* sleeping_queue{};
+ KThreadQueue* wait_queue{};
WaiterList waiter_list{};
WaiterList pinned_waiter_list{};
KThread* lock_owner{};