diff options
author | bunnei <bunneidev@gmail.com> | 2019-01-31 21:19:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-31 21:19:02 +0100 |
commit | db21ac262774029a7b844e626a6474202263f9aa (patch) | |
tree | ed14b003d8ec872cd3d815fd5b372c4e64eb9a01 | |
parent | Merge pull request #2075 from lioncash/find (diff) | |
parent | kernel/wait_object: Devirtualize functions related to manipulating the thread list directly (diff) | |
download | yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar.gz yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar.bz2 yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar.lz yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar.xz yuzu-db21ac262774029a7b844e626a6474202263f9aa.tar.zst yuzu-db21ac262774029a7b844e626a6474202263f9aa.zip |
-rw-r--r-- | src/core/hle/kernel/readable_event.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/kernel/readable_event.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/timer.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/kernel/timer.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/wait_object.h | 6 |
5 files changed, 3 insertions, 15 deletions
diff --git a/src/core/hle/kernel/readable_event.cpp b/src/core/hle/kernel/readable_event.cpp index 6973e580c..0e5083f70 100644 --- a/src/core/hle/kernel/readable_event.cpp +++ b/src/core/hle/kernel/readable_event.cpp @@ -44,8 +44,4 @@ ResultCode ReadableEvent::Reset() { return RESULT_SUCCESS; } -void ReadableEvent::WakeupAllWaitingThreads() { - WaitObject::WakeupAllWaitingThreads(); -} - } // namespace Kernel diff --git a/src/core/hle/kernel/readable_event.h b/src/core/hle/kernel/readable_event.h index 80b3b0aba..77a9c362c 100644 --- a/src/core/hle/kernel/readable_event.h +++ b/src/core/hle/kernel/readable_event.h @@ -39,8 +39,6 @@ public: bool ShouldWait(Thread* thread) const override; void Acquire(Thread* thread) override; - void WakeupAllWaitingThreads() override; - /// Unconditionally clears the readable event's state. void Clear(); diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 2c4f50e2b..3afe60469 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -66,10 +66,6 @@ void Timer::Clear() { signaled = false; } -void Timer::WakeupAllWaitingThreads() { - WaitObject::WakeupAllWaitingThreads(); -} - void Timer::Signal(int cycles_late) { LOG_TRACE(Kernel, "Timer {} fired", GetObjectId()); diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 12915c1b1..ce3e74426 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -51,8 +51,6 @@ public: bool ShouldWait(Thread* thread) const override; void Acquire(Thread* thread) override; - void WakeupAllWaitingThreads() override; - /** * Starts the timer, with the specified initial delay and interval. * @param initial Delay until the timer is first fired diff --git a/src/core/hle/kernel/wait_object.h b/src/core/hle/kernel/wait_object.h index d70b67893..5987fb971 100644 --- a/src/core/hle/kernel/wait_object.h +++ b/src/core/hle/kernel/wait_object.h @@ -33,19 +33,19 @@ public: * Add a thread to wait on this object * @param thread Pointer to thread to add */ - virtual void AddWaitingThread(SharedPtr<Thread> thread); + void AddWaitingThread(SharedPtr<Thread> thread); /** * Removes a thread from waiting on this object (e.g. if it was resumed already) * @param thread Pointer to thread to remove */ - virtual void RemoveWaitingThread(Thread* thread); + void RemoveWaitingThread(Thread* thread); /** * Wake up all threads waiting on this object that can be awoken, in priority order, * and set the synchronization result and output of the thread. */ - virtual void WakeupAllWaitingThreads(); + void WakeupAllWaitingThreads(); /** * Wakes up a single thread waiting on this object. |