N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4752 from FearlessTobi/port-2415

Browse source 
Port yuzu-emu/yuzu#2415: "kernel/wait_object: Make GetHighestPriorityReadyThread() a const member function"
This commit is contained in:
Weiyi Wang 2019-04-21 15:43:43 -04:00 committed by GitHub
commit 2706a4d658
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/kernel/wait_object.cpp
View file

@ -32,7 +32,7 @@ void WaitObject::RemoveWaitingThread(Thread* thread) {
waiting_threads.erase(itr); waiting_threads.erase(itr);
} }
std::shared_ptr<Thread> WaitObject::GetHighestPriorityReadyThread() { std::shared_ptr<Thread> WaitObject::GetHighestPriorityReadyThread() const {
Thread* candidate = nullptr; Thread* candidate = nullptr;
u32 candidate_priority = ThreadPrioLowest + 1; u32 candidate_priority = ThreadPrioLowest + 1;

2
src/core/hle/kernel/wait_object.h
View file

@ -49,7 +49,7 @@ public:
virtual void WakeupAllWaitingThreads(); virtual void WakeupAllWaitingThreads();
/// Obtains the highest priority thread that is ready to run from this object's waiting list. /// Obtains the highest priority thread that is ready to run from this object's waiting list.
std::shared_ptr<Thread> GetHighestPriorityReadyThread(); std::shared_ptr<Thread> GetHighestPriorityReadyThread() const;
/// Get a const reference to the waiting threads list for debug use /// Get a const reference to the waiting threads list for debug use
const std::vector<std::shared_ptr<Thread>>& GetWaitingThreads() const; const std::vector<std::shared_ptr<Thread>>& GetWaitingThreads() const;