H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hle: kernel: Remove unnecessary virtual specifier on CancelWait.

Browse Source
This commit is contained in:
bunnei 2021-12-05 23:49:26 -08:00
parent d7f6d516ce
commit 0d1bdfc1d4
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/k_address_arbiter.cpp
View File

@ -91,7 +91,7 @@ public:
explicit ThreadQueueImplForKAddressArbiter(KernelCore& kernel_, KAddressArbiter::ThreadTree* t) explicit ThreadQueueImplForKAddressArbiter(KernelCore& kernel_, KAddressArbiter::ThreadTree* t)
: KThreadQueue(kernel_), m_tree(t) {} : KThreadQueue(kernel_), m_tree(t) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// If the thread is waiting on an address arbiter, remove it from the tree. // If the thread is waiting on an address arbiter, remove it from the tree.
if (waiting_thread->IsWaitingForAddressArbiter()) { if (waiting_thread->IsWaitingForAddressArbiter()) {

4
src/core/hle/kernel/k_condition_variable.cpp
View File

@ -63,7 +63,7 @@ public:
explicit ThreadQueueImplForKConditionVariableWaitForAddress(KernelCore& kernel_) explicit ThreadQueueImplForKConditionVariableWaitForAddress(KernelCore& kernel_)
: KThreadQueue(kernel_) {} : KThreadQueue(kernel_) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Remove the thread as a waiter from its owner. // Remove the thread as a waiter from its owner.
waiting_thread->GetLockOwner()->RemoveWaiter(waiting_thread); waiting_thread->GetLockOwner()->RemoveWaiter(waiting_thread);
@ -82,7 +82,7 @@ public:
KernelCore& kernel_, KConditionVariable::ThreadTree* t) KernelCore& kernel_, KConditionVariable::ThreadTree* t)
: KThreadQueue(kernel_), m_tree(t) {} : KThreadQueue(kernel_), m_tree(t) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Remove the thread as a waiter from its owner. // Remove the thread as a waiter from its owner.
if (KThread* owner = waiting_thread->GetLockOwner(); owner != nullptr) { if (KThread* owner = waiting_thread->GetLockOwner(); owner != nullptr) {

2
src/core/hle/kernel/k_light_condition_variable.cpp
View File

@ -18,7 +18,7 @@ public:
bool term) bool term)
: KThreadQueue(kernel_), m_wait_list(wl), m_allow_terminating_thread(term) {} : KThreadQueue(kernel_), m_wait_list(wl), m_allow_terminating_thread(term) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Only process waits if we're allowed to. // Only process waits if we're allowed to.
if (ResultTerminationRequested == wait_result && m_allow_terminating_thread) { if (ResultTerminationRequested == wait_result && m_allow_terminating_thread) {

2
src/core/hle/kernel/k_light_lock.cpp
View File

@ -16,7 +16,7 @@ class ThreadQueueImplForKLightLock final : public KThreadQueue {
public: public:
explicit ThreadQueueImplForKLightLock(KernelCore& kernel_) : KThreadQueue(kernel_) {} explicit ThreadQueueImplForKLightLock(KernelCore& kernel_) : KThreadQueue(kernel_) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Remove the thread as a waiter from its owner. // Remove the thread as a waiter from its owner.
if (KThread* owner = waiting_thread->GetLockOwner(); owner != nullptr) { if (KThread* owner = waiting_thread->GetLockOwner(); owner != nullptr) {

2
src/core/hle/kernel/k_synchronization_object.cpp
View File

@ -46,7 +46,7 @@ public:
KThreadQueue::EndWait(waiting_thread, wait_result); KThreadQueue::EndWait(waiting_thread, wait_result);
} }
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Remove all nodes from our list. // Remove all nodes from our list.
for (auto i = 0; i < m_count; ++i) { for (auto i = 0; i < m_count; ++i) {

2
src/core/hle/kernel/k_thread.cpp
View File

@ -72,7 +72,7 @@ public:
explicit ThreadQueueImplForKThreadSetProperty(KernelCore& kernel_, KThread::WaiterList* wl) explicit ThreadQueueImplForKThreadSetProperty(KernelCore& kernel_, KThread::WaiterList* wl)
: KThreadQueue(kernel_), m_wait_list(wl) {} : KThreadQueue(kernel_), m_wait_list(wl) {}
virtual void CancelWait(KThread* waiting_thread, ResultCode wait_result, void CancelWait(KThread* waiting_thread, ResultCode wait_result,
bool cancel_timer_task) override { bool cancel_timer_task) override {
// Remove the thread from the wait list. // Remove the thread from the wait list.
m_wait_list->erase(m_wait_list->iterator_to(*waiting_thread)); m_wait_list->erase(m_wait_list->iterator_to(*waiting_thread));