1 files changed, 39 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index d3684896..52dca4dd 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -14,10 +14,47 @@
 
 namespace Kernel {
 
+unsigned int Object::next_object_id = 0;
+
 SharedPtr<Thread> g_main_thread = nullptr;
 HandleTable g_handle_table;
 u64 g_program_id = 0;
 
+void WaitObject::AddWaitingThread(SharedPtr<Thread> thread) {
+    auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread);
+    if (itr == waiting_threads.end())
+        waiting_threads.push_back(std::move(thread));
+}
+
+void WaitObject::RemoveWaitingThread(Thread* thread) {
+    auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread);
+    if (itr != waiting_threads.end())
+        waiting_threads.erase(itr);
+}
+
+SharedPtr<Thread> WaitObject::WakeupNextThread() {
+    if (waiting_threads.empty())
+        return nullptr;
+
+    auto next_thread = std::move(waiting_threads.front());
+    waiting_threads.erase(waiting_threads.begin());
+
+    next_thread->ReleaseWaitObject(this);
+
+    return next_thread;
+}
+
+void WaitObject::WakeupAllWaitingThreads() {
+    auto waiting_threads_copy = waiting_threads;
+
+    // We use a copy because ReleaseWaitObject will remove the thread from this object's
+    // waiting_threads list
+    for (auto thread : waiting_threads_copy)
+        thread->ReleaseWaitObject(this);
+
+    _assert_msg_(Kernel, waiting_threads.empty(), "failed to awaken all waiting threads!");
+}
+
 HandleTable::HandleTable() {
     next_generation = 1;
     Clear();
@@ -39,13 +76,10 @@ ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
     // CTR-OS doesn't use generation 0, so skip straight to 1.
     if (next_generation >= (1 << 15)) next_generation = 1;
 
-    Handle handle = generation | (slot << 15);
-    if (obj->handle == INVALID_HANDLE)
-        obj->handle = handle;
-
     generations[slot] = generation;
     objects[slot] = std::move(obj);
 
+    Handle handle = generation | (slot << 15);
     return MakeResult<Handle>(handle);
 }
 
@@ -63,11 +97,10 @@ ResultCode HandleTable::Close(Handle handle) {
         return ERR_INVALID_HANDLE;
 
     size_t slot = GetSlot(handle);
-    u16 generation = GetGeneration(handle);
 
     objects[slot] = nullptr;
 
-    generations[generation] = next_free_slot;
+    generations[slot] = next_free_slot;
     next_free_slot = slot;
     return RESULT_SUCCESS;
 }