From f69a543110703e09adc830bbc65e3c39be0cc52b Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Fri, 8 Apr 2016 19:28:54 +0300
Subject: implement wait tree widget

---
 src/core/hle/kernel/kernel.cpp | 4 ++++
 src/core/hle/kernel/kernel.h   | 3 +++
 src/core/hle/kernel/thread.cpp | 4 ++++
 src/core/hle/kernel/thread.h   | 5 +++++
 4 files changed, 16 insertions(+)

(limited to 'src/core/hle/kernel')

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() {
     HLE::Reschedule(__func__);
 }
 
+const std::vector<SharedPtr<Thread>>& WaitObject::GetWaitingThreads() const {
+    return waiting_threads;
+}
+
 HandleTable::HandleTable() {
     next_generation = 1;
     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:
     /// Wake up all threads waiting on this object
     void WakeupAllWaitingThreads();
 
+    /// Get a const reference to the waiting threads list for debug use
+    const std::vector<SharedPtr<Thread>>& GetWaitingThreads() const;
+
 private:
     /// Threads waiting for this object to become available
     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() {
     ready_queue.clear();
 }
 
+const std::vector<SharedPtr<Thread>>& GetThreadList() {
+    return thread_list;
+}
+
 } // 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();
  */
 void ThreadingShutdown();
 
+/**
+ * Get a const reference to the thread list for debug use
+ */
+const std::vector<SharedPtr<Thread>>& GetThreadList();
+
 } // namespace
-- 
cgit v1.2.3


From 85a83158fbee48f9281f7e3c60c461d7f73c3a1b Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Wed, 25 May 2016 13:36:15 +0300
Subject: move ResetType to kernel.h

---
 src/core/hle/kernel/event.h  | 6 ------
 src/core/hle/kernel/kernel.h | 6 ++++++
 src/core/hle/kernel/timer.h  | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/core/hle/kernel')

diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h
index 6fe74065d..8dcd23edb 100644
--- a/src/core/hle/kernel/event.h
+++ b/src/core/hle/kernel/event.h
@@ -9,12 +9,6 @@
 
 namespace Kernel {
 
-enum class ResetType {
-    OneShot,
-    Sticky,
-    Pulse,
-};
-
 class Event final : public WaitObject {
 public:
     /**
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 40c78b436..6b8dbecff 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -53,6 +53,12 @@ enum {
     DEFAULT_STACK_SIZE = 0x4000,
 };
 
+enum class ResetType {
+    OneShot,
+    Sticky,
+    Pulse,
+};
+
 class Object : NonCopyable {
 public:
     virtual ~Object() {}
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h
index 59a77aad3..18ea0236b 100644
--- a/src/core/hle/kernel/timer.h
+++ b/src/core/hle/kernel/timer.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
 
 namespace Kernel {
-- 
cgit v1.2.3