diff options
| author | 2016-04-08 19:28:54 +0300 | |
|---|---|---|
| committer | 2016-09-22 13:52:52 +0800 | |
| commit | f69a543110703e09adc830bbc65e3c39be0cc52b (patch) | |
| tree | 6698d241fb60109d5eae43ff6ece00fef9aa91d8 /src/core/hle/kernel | |
| parent | Merge pull request #2099 from citra-emu/fix-clang-format (diff) | |
| download | yuzu-f69a543110703e09adc830bbc65e3c39be0cc52b.tar.gz yuzu-f69a543110703e09adc830bbc65e3c39be0cc52b.tar.xz yuzu-f69a543110703e09adc830bbc65e3c39be0cc52b.zip | |
implement wait tree widget
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 5 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 9a2c8ce05..9e1795927 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -40,6 +40,10 @@ void WaitObject::WakeupAllWaitingThreads() { | |||
| 40 | HLE::Reschedule(__func__); | 40 | HLE::Reschedule(__func__); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | const std::vector<SharedPtr<Thread>>& WaitObject::GetWaitingThreads() const { | ||
| 44 | return waiting_threads; | ||
| 45 | } | ||
| 46 | |||
| 43 | HandleTable::HandleTable() { | 47 | HandleTable::HandleTable() { |
| 44 | next_generation = 1; | 48 | next_generation = 1; |
| 45 | Clear(); | 49 | Clear(); |
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 0e95f7ff0..40c78b436 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -149,6 +149,9 @@ public: | |||
| 149 | /// Wake up all threads waiting on this object | 149 | /// Wake up all threads waiting on this object |
| 150 | void WakeupAllWaitingThreads(); | 150 | void WakeupAllWaitingThreads(); |
| 151 | 151 | ||
| 152 | /// Get a const reference to the waiting threads list for debug use | ||
| 153 | const std::vector<SharedPtr<Thread>>& GetWaitingThreads() const; | ||
| 154 | |||
| 152 | private: | 155 | private: |
| 153 | /// Threads waiting for this object to become available | 156 | /// Threads waiting for this object to become available |
| 154 | std::vector<SharedPtr<Thread>> waiting_threads; | 157 | std::vector<SharedPtr<Thread>> waiting_threads; |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 4486a812c..c4eeeee56 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -665,4 +665,8 @@ void ThreadingShutdown() { | |||
| 665 | ready_queue.clear(); | 665 | ready_queue.clear(); |
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | const std::vector<SharedPtr<Thread>>& GetThreadList() { | ||
| 669 | return thread_list; | ||
| 670 | } | ||
| 671 | |||
| 668 | } // namespace | 672 | } // namespace |
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index f63131716..e0ffcea8a 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -236,4 +236,9 @@ void ThreadingInit(); | |||
| 236 | */ | 236 | */ |
| 237 | void ThreadingShutdown(); | 237 | void ThreadingShutdown(); |
| 238 | 238 | ||
| 239 | /** | ||
| 240 | * Get a const reference to the thread list for debug use | ||
| 241 | */ | ||
| 242 | const std::vector<SharedPtr<Thread>>& GetThreadList(); | ||
| 243 | |||
| 239 | } // namespace | 244 | } // namespace |