VERY experimental Nintendo Switch 2 emulator
C++
kernel: remove KWritableEvent
Liam09777eea76da
diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cppindex e7f918a47b..6b7e6715cf 100644--- a/src/audio_core/in/audio_in_system.cpp+++ b/src/audio_core/in/audio_in_system.cpp@@ -23,7 +23,7 @@ System::~System() {void System::Finalize() {Stop();session->Finalize();- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}void System::StartSession() {@@ -142,7 +142,7 @@ void System::ReleaseBuffers() {if (signal) {// Signal if any buffer was released, or if none are registered, we need more.- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}}@@ -159,7 +159,7 @@ bool System::FlushAudioInBuffers() {buffers.FlushBuffers(buffers_released);if (buffers_released > 0) {- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}return true;}diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cppindex 8b907590a9..48a8019232 100644--- a/src/audio_core/out/audio_out_system.cpp+++ b/src/audio_core/out/audio_out_system.cpp@@ -24,7 +24,7 @@ System::~System() {void System::Finalize() {Stop();session->Finalize();- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}std::string_view System::GetDefaultOutputDeviceName() const {@@ -141,7 +141,7 @@ void System::ReleaseBuffers() {bool signal{buffers.ReleaseBuffers(system.CoreTiming(), *session)};if (signal) {// Signal if any buffer was released, or if none are registered, we need more.- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}}@@ -158,7 +158,7 @@ bool System::FlushAudioOutBuffers() {buffers.FlushBuffers(buffers_released);if (buffers_released > 0) {- buffer_event->GetWritableEvent().Signal();+ buffer_event->Signal();}return true;}diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cppindex 7a217969e9..bde794cd1c 100644--- a/src/audio_core/renderer/system.cpp+++ b/src/audio_core/renderer/system.cpp@@ -534,7 +534,7 @@ Result System::Update(std::span<const u8> input, std::span<u8> performance, std:return result;}- adsp_rendered_event->GetWritableEvent().Clear();+ adsp_rendered_event->Clear();num_times_updated++;const auto end_time{core.CoreTiming().GetClockTicks()};@@ -625,7 +625,7 @@ void System::SendCommandToDsp() {reset_command_buffers = false;command_buffer_size = command_size;if (remaining_command_count == 0) {- adsp_rendered_event->GetWritableEvent().Signal();+ adsp_rendered_event->Signal();}} else {adsp.ClearRemainCount(session_id);diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 95302c419a..abeb5859b5 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -261,8 +261,6 @@ add_library(core STATIChle/kernel/k_worker_task.hhle/kernel/k_worker_task_manager.cpphle/kernel/k_worker_task_manager.h- hle/kernel/k_writable_event.cpp- hle/kernel/k_writable_event.hhle/kernel/kernel.cpphle/kernel/kernel.hhle/kernel/memory_types.hdiff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.hindex 99265ce90a..e258e2cdfe 100644--- a/src/core/hle/kernel/hle_ipc.h+++ b/src/core/hle/kernel/hle_ipc.h@@ -43,13 +43,13 @@ class Domain;class HLERequestContext;class KAutoObject;class KernelCore;+class KEvent;class KHandleTable;class KProcess;class KServerSession;class KThread;class KReadableEvent;class KSession;-class KWritableEvent;class ServiceThread;enum class ThreadWakeupReason;diff --git a/src/core/hle/kernel/k_class_token.cpp b/src/core/hle/kernel/k_class_token.cppindex cc2a0f7cae..10265c23ce 100644--- a/src/core/hle/kernel/k_class_token.cpp+++ b/src/core/hle/kernel/k_class_token.cpp@@ -18,7 +18,6 @@#include "core/hle/kernel/k_synchronization_object.h"#include "core/hle/kernel/k_thread.h"#include "core/hle/kernel/k_transfer_memory.h"-#include "core/hle/kernel/k_writable_event.h"namespace Kernel {@@ -42,13 +41,12 @@ static_assert(ClassToken<KPort> == 0b10000101'00000000);static_assert(ClassToken<KSession> == 0b00011001'00000000);static_assert(ClassToken<KSharedMemory> == 0b00101001'00000000);static_assert(ClassToken<KEvent> == 0b01001001'00000000);-static_assert(ClassToken<KWritableEvent> == 0b10001001'00000000);// static_assert(ClassToken<KLightClientSession> == 0b00110001'00000000);// static_assert(ClassToken<KLightServerSession> == 0b01010001'00000000);-static_assert(ClassToken<KTransferMemory> == 0b10010001'00000000);+static_assert(ClassToken<KTransferMemory> == 0b01010001'00000000);// static_assert(ClassToken<KDeviceAddressSpace> == 0b01100001'00000000);// static_assert(ClassToken<KSessionRequest> == 0b10100001'00000000);-static_assert(ClassToken<KCodeMemory> == 0b11000001'00000000);+static_assert(ClassToken<KCodeMemory> == 0b10100001'00000000);// Ensure that the token hierarchy is correct.@@ -73,13 +71,12 @@ static_assert(ClassToken<KPort> == ((0b10000101 << 8) | ClassToken<KAutoObject>)static_assert(ClassToken<KSession> == ((0b00011001 << 8) | ClassToken<KAutoObject>));static_assert(ClassToken<KSharedMemory> == ((0b00101001 << 8) | ClassToken<KAutoObject>));static_assert(ClassToken<KEvent> == ((0b01001001 << 8) | ClassToken<KAutoObject>));-static_assert(ClassToken<KWritableEvent> == ((0b10001001 << 8) | ClassToken<KAutoObject>));// static_assert(ClassToken<KLightClientSession> == ((0b00110001 << 8) | ClassToken<KAutoObject>));// static_assert(ClassToken<KLightServerSession> == ((0b01010001 << 8) | ClassToken<KAutoObject>));-static_assert(ClassToken<KTransferMemory> == ((0b10010001 << 8) | ClassToken<KAutoObject>));+static_assert(ClassToken<KTransferMemory> == ((0b01010001 << 8) | ClassToken<KAutoObject>));// static_assert(ClassToken<KDeviceAddressSpace> == ((0b01100001 << 8) | ClassToken<KAutoObject>));// static_assert(ClassToken<KSessionRequest> == ((0b10100001 << 8) | ClassToken<KAutoObject>));-static_assert(ClassToken<KCodeMemory> == ((0b11000001 << 8) | ClassToken<KAutoObject>));+static_assert(ClassToken<KCodeMemory> == ((0b10100001 << 8) | ClassToken<KAutoObject>));// Ensure that the token hierarchy reflects the class hierarchy.@@ -110,7 +107,6 @@ static_assert(std::is_final_v<KPort> && std::is_base_of_v<KAutoObject, KPort>);static_assert(std::is_final_v<KSession> && std::is_base_of_v<KAutoObject, KSession>);static_assert(std::is_final_v<KSharedMemory> && std::is_base_of_v<KAutoObject, KSharedMemory>);static_assert(std::is_final_v<KEvent> && std::is_base_of_v<KAutoObject, KEvent>);-static_assert(std::is_final_v<KWritableEvent> && std::is_base_of_v<KAutoObject, KWritableEvent>);// static_assert(std::is_final_v<KLightClientSession> &&// std::is_base_of_v<KAutoObject, KLightClientSession>);// static_assert(std::is_final_v<KLightServerSession> &&diff --git a/src/core/hle/kernel/k_class_token.h b/src/core/hle/kernel/k_class_token.hindex c9001ae3d8..ab20e00ff8 100644--- a/src/core/hle/kernel/k_class_token.h+++ b/src/core/hle/kernel/k_class_token.h@@ -101,7 +101,6 @@ public:KSession,KSharedMemory,KEvent,- KWritableEvent,KLightClientSession,KLightServerSession,KTransferMemory,diff --git a/src/core/hle/kernel/k_event.cpp b/src/core/hle/kernel/k_event.cppindex e52fafbc7c..78ca594635 100644--- a/src/core/hle/kernel/k_event.cpp+++ b/src/core/hle/kernel/k_event.cpp@@ -8,39 +8,45 @@namespace Kernel {KEvent::KEvent(KernelCore& kernel_)- : KAutoObjectWithSlabHeapAndContainer{kernel_}, readable_event{kernel_}, writable_event{- kernel_} {}+ : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_readable_event{kernel_} {}KEvent::~KEvent() = default;-void KEvent::Initialize(std::string&& name_, KProcess* owner_) {- // Increment reference count.- // Because reference count is one on creation, this will result- // in a reference count of two. Thus, when both readable and- // writable events are closed this object will be destroyed.- Open();+void KEvent::Initialize(KProcess* owner) {+ // Create our readable event.+ KAutoObject::Create(std::addressof(m_readable_event));- // Create our sub events.- KAutoObject::Create(std::addressof(readable_event));- KAutoObject::Create(std::addressof(writable_event));-- // Initialize our sub sessions.- readable_event.Initialize(this, name_ + ":Readable");- writable_event.Initialize(this, name_ + ":Writable");+ // Initialize our readable event.+ m_readable_event.Initialize(this);// Set our owner process.- owner = owner_;- owner->Open();+ m_owner = owner;+ m_owner->Open();// Mark initialized.- name = std::move(name_);- initialized = true;+ m_initialized = true;}void KEvent::Finalize() {KAutoObjectWithSlabHeapAndContainer<KEvent, KAutoObjectWithList>::Finalize();}+Result KEvent::Signal() {+ KScopedSchedulerLock sl{kernel};++ R_SUCCEED_IF(m_readable_event_destroyed);++ return m_readable_event.Signal();+}++Result KEvent::Clear() {+ KScopedSchedulerLock sl{kernel};++ R_SUCCEED_IF(m_readable_event_destroyed);++ return m_readable_event.Clear();+}+void KEvent::PostDestroy(uintptr_t arg) {// Release the event count resource the owner process holds.KProcess* owner = reinterpret_cast<KProcess*>(arg);diff --git a/src/core/hle/kernel/k_event.h b/src/core/hle/kernel/k_event.hindex 2ff828feb3..48ce7d9a06 100644--- a/src/core/hle/kernel/k_event.h+++ b/src/core/hle/kernel/k_event.h@@ -4,14 +4,12 @@#pragma once#include "core/hle/kernel/k_readable_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/kernel/slab_helpers.h"namespace Kernel {class KernelCore;class KReadableEvent;-class KWritableEvent;class KProcess;class KEvent final : public KAutoObjectWithSlabHeapAndContainer<KEvent, KAutoObjectWithList> {@@ -21,37 +19,40 @@ public:explicit KEvent(KernelCore& kernel_);~KEvent() override;- void Initialize(std::string&& name, KProcess* owner_);+ void Initialize(KProcess* owner);void Finalize() override;bool IsInitialized() const override {- return initialized;+ return m_initialized;}uintptr_t GetPostDestroyArgument() const override {- return reinterpret_cast<uintptr_t>(owner);+ return reinterpret_cast<uintptr_t>(m_owner);}KProcess* GetOwner() const override {- return owner;+ return m_owner;}KReadableEvent& GetReadableEvent() {- return readable_event;- }-- KWritableEvent& GetWritableEvent() {- return writable_event;+ return m_readable_event;}static void PostDestroy(uintptr_t arg);+ Result Signal();+ Result Clear();++ void OnReadableEventDestroyed() {+ m_readable_event_destroyed = true;+ }+private:- KReadableEvent readable_event;- KWritableEvent writable_event;- KProcess* owner{};- bool initialized{};+ KReadableEvent m_readable_event;+ KProcess* m_owner{};+ bool m_initialized{};+ bool m_readable_event_destroyed{};};} // namespace Kerneldiff --git a/src/core/hle/kernel/k_readable_event.cpp b/src/core/hle/kernel/k_readable_event.cppindex 94c5464fe8..5c942d47c8 100644--- a/src/core/hle/kernel/k_readable_event.cpp+++ b/src/core/hle/kernel/k_readable_event.cpp@@ -15,31 +15,44 @@ KReadableEvent::KReadableEvent(KernelCore& kernel_) : KSynchronizationObject{kerKReadableEvent::~KReadableEvent() = default;+void KReadableEvent::Initialize(KEvent* parent) {+ m_is_signaled = false;+ m_parent = parent;++ if (m_parent != nullptr) {+ m_parent->Open();+ }+}+bool KReadableEvent::IsSignaled() const {- ASSERT(kernel.GlobalSchedulerContext().IsLocked());+ ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel));- return is_signaled;+ return m_is_signaled;}void KReadableEvent::Destroy() {- if (parent) {- parent->Close();+ if (m_parent) {+ {+ KScopedSchedulerLock sl{kernel};+ m_parent->OnReadableEventDestroyed();+ }+ m_parent->Close();}}Result KReadableEvent::Signal() {KScopedSchedulerLock lk{kernel};- if (!is_signaled) {- is_signaled = true;- NotifyAvailable();+ if (!m_is_signaled) {+ m_is_signaled = true;+ this->NotifyAvailable();}return ResultSuccess;}Result KReadableEvent::Clear() {- Reset();+ this->Reset();return ResultSuccess;}@@ -47,11 +60,11 @@ Result KReadableEvent::Clear() {Result KReadableEvent::Reset() {KScopedSchedulerLock lk{kernel};- if (!is_signaled) {+ if (!m_is_signaled) {return ResultInvalidState;}- is_signaled = false;+ m_is_signaled = false;return ResultSuccess;}diff --git a/src/core/hle/kernel/k_readable_event.h b/src/core/hle/kernel/k_readable_event.hindex 18dcad289b..743f96bf59 100644--- a/src/core/hle/kernel/k_readable_event.h+++ b/src/core/hle/kernel/k_readable_event.h@@ -20,26 +20,23 @@ public:explicit KReadableEvent(KernelCore& kernel_);~KReadableEvent() override;- void Initialize(KEvent* parent_event_, std::string&& name_) {- is_signaled = false;- parent = parent_event_;- name = std::move(name_);- }+ void Initialize(KEvent* parent);KEvent* GetParent() const {- return parent;+ return m_parent;}+ Result Signal();+ Result Clear();+bool IsSignaled() const override;void Destroy() override;- Result Signal();- Result Clear();Result Reset();private:- bool is_signaled{};- KEvent* parent{};+ bool m_is_signaled{};+ KEvent* m_parent{};};} // namespace Kerneldiff --git a/src/core/hle/kernel/k_writable_event.cpp b/src/core/hle/kernel/k_writable_event.cppdeleted file mode 100644index ff88c5acd3..0000000000--- a/src/core/hle/kernel/k_writable_event.cpp+++ /dev/null@@ -1,35 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#include "core/hle/kernel/k_event.h"-#include "core/hle/kernel/k_readable_event.h"-#include "core/hle/kernel/k_writable_event.h"--namespace Kernel {--KWritableEvent::KWritableEvent(KernelCore& kernel_)- : KAutoObjectWithSlabHeapAndContainer{kernel_} {}--KWritableEvent::~KWritableEvent() = default;--void KWritableEvent::Initialize(KEvent* parent_event_, std::string&& name_) {- parent = parent_event_;- name = std::move(name_);- parent->GetReadableEvent().Open();-}--Result KWritableEvent::Signal() {- return parent->GetReadableEvent().Signal();-}--Result KWritableEvent::Clear() {- return parent->GetReadableEvent().Clear();-}--void KWritableEvent::Destroy() {- // Close our references.- parent->GetReadableEvent().Close();- parent->Close();-}--} // namespace Kerneldiff --git a/src/core/hle/kernel/k_writable_event.h b/src/core/hle/kernel/k_writable_event.hdeleted file mode 100644index 3fd0c7d0ae..0000000000--- a/src/core/hle/kernel/k_writable_event.h+++ /dev/null@@ -1,39 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#pragma once--#include "core/hle/kernel/k_auto_object.h"-#include "core/hle/kernel/slab_helpers.h"-#include "core/hle/result.h"--namespace Kernel {--class KernelCore;-class KEvent;--class KWritableEvent final- : public KAutoObjectWithSlabHeapAndContainer<KWritableEvent, KAutoObjectWithList> {- KERNEL_AUTOOBJECT_TRAITS(KWritableEvent, KAutoObject);--public:- explicit KWritableEvent(KernelCore& kernel_);- ~KWritableEvent() override;-- void Destroy() override;-- static void PostDestroy([[maybe_unused]] uintptr_t arg) {}-- void Initialize(KEvent* parent_, std::string&& name_);- Result Signal();- Result Clear();-- KEvent* GetParent() const {- return parent;- }--private:- KEvent* parent{};-};--} // namespace Kerneldiff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.hindex bcf016a971..0847cbcbf7 100644--- a/src/core/hle/kernel/kernel.h+++ b/src/core/hle/kernel/kernel.h@@ -52,7 +52,6 @@ class KThread;class KThreadLocalPage;class KTransferMemory;class KWorkerTaskManager;-class KWritableEvent;class KCodeMemory;class PhysicalCore;class ServiceThread;@@ -345,8 +344,6 @@ public:return slab_heap_container->thread;} else if constexpr (std::is_same_v<T, KTransferMemory>) {return slab_heap_container->transfer_memory;- } else if constexpr (std::is_same_v<T, KWritableEvent>) {- return slab_heap_container->writeable_event;} else if constexpr (std::is_same_v<T, KCodeMemory>) {return slab_heap_container->code_memory;} else if constexpr (std::is_same_v<T, KPageBuffer>) {@@ -412,7 +409,6 @@ private:KSlabHeap<KSharedMemoryInfo> shared_memory_info;KSlabHeap<KThread> thread;KSlabHeap<KTransferMemory> transfer_memory;- KSlabHeap<KWritableEvent> writeable_event;KSlabHeap<KCodeMemory> code_memory;KSlabHeap<KPageBuffer> page_buffer;KSlabHeap<KThreadLocalPage> thread_local_page;diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cppindex 27e5a805db..035607daf9 100644--- a/src/core/hle/kernel/svc.cpp+++ b/src/core/hle/kernel/svc.cpp@@ -34,7 +34,6 @@#include "core/hle/kernel/k_thread.h"#include "core/hle/kernel/k_thread_queue.h"#include "core/hle/kernel/k_transfer_memory.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/kernel/kernel.h"#include "core/hle/kernel/physical_core.h"#include "core/hle/kernel/svc.h"@@ -2303,11 +2302,11 @@ static Result SignalEvent(Core::System& system, Handle event_handle) {// Get the current handle table.const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();- // Get the writable event.- KScopedAutoObject writable_event = handle_table.GetObject<KWritableEvent>(event_handle);- R_UNLESS(writable_event.IsNotNull(), ResultInvalidHandle);+ // Get the event.+ KScopedAutoObject event = handle_table.GetObject<KEvent>(event_handle);+ R_UNLESS(event.IsNotNull(), ResultInvalidHandle);- return writable_event->Signal();+ return event->Signal();}static Result SignalEvent32(Core::System& system, Handle event_handle) {@@ -2322,9 +2321,9 @@ static Result ClearEvent(Core::System& system, Handle event_handle) {// Try to clear the writable event.{- KScopedAutoObject writable_event = handle_table.GetObject<KWritableEvent>(event_handle);- if (writable_event.IsNotNull()) {- return writable_event->Clear();+ KScopedAutoObject event = handle_table.GetObject<KEvent>(event_handle);+ if (event.IsNotNull()) {+ return event->Clear();}}@@ -2362,24 +2361,24 @@ static Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_rR_UNLESS(event != nullptr, ResultOutOfResource);// Initialize the event.- event->Initialize("CreateEvent", kernel.CurrentProcess());+ event->Initialize(kernel.CurrentProcess());// Commit the thread reservation.event_reservation.Commit();// Ensure that we clean up the event (and its only references are handle table) on function end.SCOPE_EXIT({- event->GetWritableEvent().Close();event->GetReadableEvent().Close();+ event->Close();});// Register the event.KEvent::Register(kernel, event);- // Add the writable event to the handle table.- R_TRY(handle_table.Add(out_write, std::addressof(event->GetWritableEvent())));+ // Add the event to the handle table.+ R_TRY(handle_table.Add(out_write, event));- // Add the writable event to the handle table.+ // Ensure that we maintaing a clean handle state on exit.auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); });// Add the readable event to the handle table.diff --git a/src/core/hle/service/acc/async_context.cpp b/src/core/hle/service/acc/async_context.cppindex c85b2e43a1..713689d8f2 100644--- a/src/core/hle/service/acc/async_context.cpp+++ b/src/core/hle/service/acc/async_context.cpp@@ -64,7 +64,7 @@ void IAsyncContext::GetResult(Kernel::HLERequestContext& ctx) {void IAsyncContext::MarkComplete() {is_complete.store(true);- completion_event->GetWritableEvent().Signal();+ completion_event->Signal();}} // namespace Service::Accountdiff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex 6fb7e198ea..e55233054f 100644--- a/src/core/hle/service/am/am.cpp+++ b/src/core/hle/service/am/am.cpp@@ -316,7 +316,7 @@ ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvaccumulated_suspended_tick_changed_event =service_context.CreateEvent("ISelfController:AccumulatedSuspendedTickChangedEvent");- accumulated_suspended_tick_changed_event->GetWritableEvent().Signal();+ accumulated_suspended_tick_changed_event->Signal();}ISelfController::~ISelfController() {@@ -378,7 +378,7 @@ void ISelfController::LeaveFatalSection(Kernel::HLERequestContext& ctx) {void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) {LOG_WARNING(Service_AM, "(STUBBED) called");- launchable_event->GetWritableEvent().Signal();+ launchable_event->Signal();IPC::ResponseBuilder rb{ctx, 2, 1};rb.Push(ResultSuccess);@@ -618,18 +618,18 @@ Kernel::KReadableEvent& AppletMessageQueue::GetOperationModeChangedEvent() {void AppletMessageQueue::PushMessage(AppletMessage msg) {messages.push(msg);- on_new_message->GetWritableEvent().Signal();+ on_new_message->Signal();}AppletMessageQueue::AppletMessage AppletMessageQueue::PopMessage() {if (messages.empty()) {- on_new_message->GetWritableEvent().Clear();+ on_new_message->Clear();return AppletMessage::None;}auto msg = messages.front();messages.pop();if (messages.empty()) {- on_new_message->GetWritableEvent().Clear();+ on_new_message->Clear();}return msg;}@@ -653,7 +653,7 @@ void AppletMessageQueue::FocusStateChanged() {void AppletMessageQueue::OperationModeChanged() {PushMessage(AppletMessage::OperationModeChanged);PushMessage(AppletMessage::PerformanceModeChanged);- on_operation_mode_changed->GetWritableEvent().Signal();+ on_operation_mode_changed->Signal();}ICommonStateGetter::ICommonStateGetter(Core::System& system_,diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cppindex b5b8e4cad7..7062df21c6 100644--- a/src/core/hle/service/am/applets/applets.cpp+++ b/src/core/hle/service/am/applets/applets.cpp@@ -65,7 +65,7 @@ std::shared_ptr<IStorage> AppletDataBroker::PopNormalDataToGame() {auto out = std::move(out_channel.front());out_channel.pop_front();- pop_out_data_event->GetWritableEvent().Clear();+ pop_out_data_event->Clear();return out;}@@ -84,7 +84,7 @@ std::shared_ptr<IStorage> AppletDataBroker::PopInteractiveDataToGame() {auto out = std::move(out_interactive_channel.front());out_interactive_channel.pop_front();- pop_interactive_out_data_event->GetWritableEvent().Clear();+ pop_interactive_out_data_event->Clear();return out;}@@ -103,7 +103,7 @@ void AppletDataBroker::PushNormalDataFromGame(std::shared_ptr<IStorage>&& storagvoid AppletDataBroker::PushNormalDataFromApplet(std::shared_ptr<IStorage>&& storage) {out_channel.emplace_back(std::move(storage));- pop_out_data_event->GetWritableEvent().Signal();+ pop_out_data_event->Signal();}void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr<IStorage>&& storage) {@@ -112,11 +112,11 @@ void AppletDataBroker::PushInteractiveDataFromGame(std::shared_ptr<IStorage>&& svoid AppletDataBroker::PushInteractiveDataFromApplet(std::shared_ptr<IStorage>&& storage) {out_interactive_channel.emplace_back(std::move(storage));- pop_interactive_out_data_event->GetWritableEvent().Signal();+ pop_interactive_out_data_event->Signal();}void AppletDataBroker::SignalStateChanged() {- state_changed_event->GetWritableEvent().Signal();+ state_changed_event->Signal();switch (applet_mode) {case LibraryAppletMode::AllForeground:diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cppindex 6fb07c37dc..60c30cd5bc 100644--- a/src/core/hle/service/audio/audren_u.cpp+++ b/src/core/hle/service/audio/audren_u.cpp@@ -239,7 +239,7 @@ public:};RegisterHandlers(functions);- event->GetWritableEvent().Signal();+ event->Signal();}~IAudioDevice() override {@@ -325,7 +325,7 @@ private:void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {LOG_DEBUG(Service_Audio, "(STUBBED) called");- event->GetWritableEvent().Signal();+ event->Signal();IPC::ResponseBuilder rb{ctx, 2, 1};rb.Push(ResultSuccess);diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cppindex cd0b405ffa..847f769874 100644--- a/src/core/hle/service/bcat/backend/backend.cpp+++ b/src/core/hle/service/bcat/backend/backend.cpp@@ -82,7 +82,7 @@ void ProgressServiceBackend::FinishDownload(Result result) {}void ProgressServiceBackend::SignalUpdate() {- update_event->GetWritableEvent().Signal();+ update_event->Signal();}Backend::Backend(DirectoryGetter getter) : dir_getter(std::move(getter)) {}diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex f8972ec7a5..98e4f2af7f 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -16,7 +16,6 @@#include "core/hid/hid_core.h"#include "core/hle/kernel/k_event.h"#include "core/hle/kernel/k_readable_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/service/hid/controllers/npad.h"#include "core/hle/service/hid/errors.h"#include "core/hle/service/kernel_helpers.h"@@ -167,7 +166,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {const auto& battery_level = controller.device->GetBattery();auto* shared_memory = controller.shared_memory;if (controller_type == Core::HID::NpadStyleIndex::None) {- controller.styleset_changed_event->GetWritableEvent().Signal();+ controller.styleset_changed_event->Signal();return;}@@ -1033,7 +1032,7 @@ Kernel::KReadableEvent& Controller_NPad::GetStyleSetChangedEvent(Core::HID::Npadvoid Controller_NPad::SignalStyleSetChangedEvent(Core::HID::NpadIdType npad_id) const {const auto& controller = GetControllerFromNpadIdType(npad_id);- controller.styleset_changed_event->GetWritableEvent().Signal();+ controller.styleset_changed_event->Signal();}void Controller_NPad::AddNewControllerAt(Core::HID::NpadStyleIndex controller,diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cppindex 575d4e626b..4564ea1e24 100644--- a/src/core/hle/service/hid/controllers/palma.cpp+++ b/src/core/hle/service/hid/controllers/palma.cpp@@ -73,7 +73,7 @@ Result Controller_Palma::PlayPalmaActivity(const PalmaConnectionHandle& handle,operation.operation = PalmaOperationType::PlayActivity;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -93,7 +93,7 @@ Result Controller_Palma::ReadPalmaStep(const PalmaConnectionHandle& handle) {operation.operation = PalmaOperationType::ReadStep;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -122,7 +122,7 @@ Result Controller_Palma::ReadPalmaUniqueCode(const PalmaConnectionHandle& handleoperation.operation = PalmaOperationType::ReadUniqueCode;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -133,7 +133,7 @@ Result Controller_Palma::SetPalmaUniqueCodeInvalid(const PalmaConnectionHandle&operation.operation = PalmaOperationType::SetUniqueCodeInvalid;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -147,7 +147,7 @@ Result Controller_Palma::WritePalmaRgbLedPatternEntry(const PalmaConnectionHandloperation.operation = PalmaOperationType::WriteRgbLedPatternEntry;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -159,7 +159,7 @@ Result Controller_Palma::WritePalmaWaveEntry(const PalmaConnectionHandle& handleoperation.operation = PalmaOperationType::WriteWaveEntry;operation.result = PalmaResultSuccess;operation.data = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -172,7 +172,7 @@ Result Controller_Palma::SetPalmaDataBaseIdentificationVersion(const PalmaConnecoperation.operation = PalmaOperationType::ReadDataBaseIdentificationVersion;operation.result = PalmaResultSuccess;operation.data[0] = {};- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}@@ -185,7 +185,7 @@ Result Controller_Palma::GetPalmaDataBaseIdentificationVersion(operation.result = PalmaResultSuccess;operation.data = {};operation.data[0] = static_cast<u8>(database_id_version);- operation_complete_event->GetWritableEvent().Signal();+ operation_complete_event->Signal();return ResultSuccess;}diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cppindex ad223d6496..57f1a2a26b 100644--- a/src/core/hle/service/hid/hidbus/ringcon.cpp+++ b/src/core/hle/service/hid/hidbus/ringcon.cpp@@ -131,12 +131,12 @@ bool RingController::SetCommand(const std::vector<u8>& data) {case RingConCommands::ReadRepCount:case RingConCommands::ReadTotalPushCount:ASSERT_MSG(data.size() == 0x4, "data.size is not 0x4 bytes");- send_command_async_event->GetWritableEvent().Signal();+ send_command_async_event->Signal();return true;case RingConCommands::ResetRepCount:ASSERT_MSG(data.size() == 0x4, "data.size is not 0x4 bytes");total_rep_count = 0;- send_command_async_event->GetWritableEvent().Signal();+ send_command_async_event->Signal();return true;case RingConCommands::SaveCalData: {ASSERT_MSG(data.size() == 0x14, "data.size is not 0x14 bytes");@@ -144,14 +144,14 @@ bool RingController::SetCommand(const std::vector<u8>& data) {SaveCalData save_info{};std::memcpy(&save_info, data.data(), sizeof(SaveCalData));user_calibration = save_info.calibration;- send_command_async_event->GetWritableEvent().Signal();+ send_command_async_event->Signal();return true;}default:LOG_ERROR(Service_HID, "Command not implemented {}", command);command = RingConCommands::Error;// Signal a reply to avoid softlocking the game- send_command_async_event->GetWritableEvent().Signal();+ send_command_async_event->Signal();return false;}}diff --git a/src/core/hle/service/kernel_helpers.cpp b/src/core/hle/service/kernel_helpers.cppindex 3e317367b0..af133af932 100644--- a/src/core/hle/service/kernel_helpers.cpp+++ b/src/core/hle/service/kernel_helpers.cpp@@ -9,7 +9,6 @@#include "core/hle/kernel/k_readable_event.h"#include "core/hle/kernel/k_resource_limit.h"#include "core/hle/kernel/k_scoped_resource_reservation.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/service/kernel_helpers.h"namespace Service::KernelHelpers {@@ -46,7 +45,7 @@ Kernel::KEvent* ServiceContext::CreateEvent(std::string&& name) {}// Initialize the event.- event->Initialize(std::move(name), process);+ event->Initialize(process);// Commit the thread reservation.event_reservation.Commit();@@ -59,7 +58,7 @@ Kernel::KEvent* ServiceContext::CreateEvent(std::string&& name) {void ServiceContext::CloseEvent(Kernel::KEvent* event) {event->GetReadableEvent().Close();- event->GetWritableEvent().Close();+ event->Close();}} // namespace Service::KernelHelpersdiff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cppindex ea3e7e55af..6df5631369 100644--- a/src/core/hle/service/ldn/ldn.cpp+++ b/src/core/hle/service/ldn/ldn.cpp@@ -165,7 +165,7 @@ public:}void OnEventFired() {- state_change_event->GetWritableEvent().Signal();+ state_change_event->Signal();}void GetState(Kernel::HLERequestContext& ctx) {diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cppindex ec895ac014..76f8a267a1 100644--- a/src/core/hle/service/nfp/nfp_device.cpp+++ b/src/core/hle/service/nfp/nfp_device.cpp@@ -58,7 +58,7 @@ NfpDevice::~NfpDevice() {void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) {if (type == Core::HID::ControllerTriggerType::Connected ||type == Core::HID::ControllerTriggerType::Disconnected) {- availability_change_event->GetWritableEvent().Signal();+ availability_change_event->Signal();return;}@@ -100,7 +100,7 @@ bool NfpDevice::LoadAmiibo(std::span<const u8> data) {device_state = DeviceState::TagFound;deactivate_event->GetReadableEvent().Clear();- activate_event->GetWritableEvent().Signal();+ activate_event->Signal();return true;}@@ -115,7 +115,7 @@ void NfpDevice::CloseAmiibo() {encrypted_tag_data = {};tag_data = {};activate_event->GetReadableEvent().Clear();- deactivate_event->GetWritableEvent().Signal();+ deactivate_event->Signal();}Kernel::KReadableEvent& NfpDevice::GetActivateEvent() const {diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cppindex b2bb7426d8..5a8a91e0bd 100644--- a/src/core/hle/service/nim/nim.cpp+++ b/src/core/hle/service/nim/nim.cpp@@ -328,7 +328,7 @@ private:void StartTask(Kernel::HLERequestContext& ctx) {// No need to connect to the internet, just finish the task straight away.LOG_DEBUG(Service_NIM, "called");- finished_event->GetWritableEvent().Signal();+ finished_event->Signal();IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);}@@ -350,7 +350,7 @@ private:void Cancel(Kernel::HLERequestContext& ctx) {LOG_DEBUG(Service_NIM, "called");- finished_event->GetWritableEvent().Clear();+ finished_event->Clear();IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);}diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cppindex 5bee4a3d3f..eee11fab88 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp@@ -12,7 +12,6 @@#include "common/scope_exit.h"#include "core/core.h"#include "core/hle/kernel/k_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/service/nvdrv/core/container.h"#include "core/hle/service/nvdrv/core/syncpoint_manager.h"#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"@@ -206,7 +205,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vectorauto& event_ = events[slot];if (event_.status.exchange(EventState::Signalling, std::memory_order_acq_rel) ==EventState::Waiting) {- event_.kevent->GetWritableEvent().Signal();+ event_.kevent->Signal();}event_.status.store(EventState::Signalled, std::memory_order_release);});@@ -306,7 +305,7 @@ NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector<u8>& input, std::v}event.fails++;event.status.store(EventState::Cancelled, std::memory_order_release);- event.kevent->GetWritableEvent().Clear();+ event.kevent->Clear();return NvResult::Success;}diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cppindex 5e7b7468f4..9d99243959 100644--- a/src/core/hle/service/nvdrv/nvdrv.cpp+++ b/src/core/hle/service/nvdrv/nvdrv.cpp@@ -8,7 +8,6 @@#include "core/core.h"#include "core/hle/ipc_helpers.h"#include "core/hle/kernel/k_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/service/nvdrv/core/container.h"#include "core/hle/service/nvdrv/devices/nvdevice.h"#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.h b/src/core/hle/service/nvdrv/nvdrv_interface.hindex cd58a4f35c..5ac06ee30b 100644--- a/src/core/hle/service/nvdrv/nvdrv_interface.h+++ b/src/core/hle/service/nvdrv/nvdrv_interface.h@@ -7,10 +7,6 @@#include "core/hle/service/nvdrv/nvdrv.h"#include "core/hle/service/service.h"-namespace Kernel {-class KWritableEvent;-}-namespace Service::Nvidia {class NVDRV final : public ServiceFramework<NVDRV> {diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvflinger/buffer_queue_producer.cppindex d4ab23a108..77ddbb6efb 100644--- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp+++ b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp@@ -11,7 +11,6 @@#include "core/hle/kernel/hle_ipc.h"#include "core/hle/kernel/k_event.h"#include "core/hle/kernel/k_readable_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/kernel/kernel.h"#include "core/hle/service/kernel_helpers.h"#include "core/hle/service/nvdrv/core/nvmap.h"@@ -110,7 +109,7 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {core->override_max_buffer_count = buffer_count;core->SignalDequeueCondition();- buffer_wait_event->GetWritableEvent().Signal();+ buffer_wait_event->Signal();listener = core->consumer_listener;}@@ -623,7 +622,7 @@ void BufferQueueProducer::CancelBuffer(s32 slot, const Fence& fence) {slots[slot].fence = fence;core->SignalDequeueCondition();- buffer_wait_event->GetWritableEvent().Signal();+ buffer_wait_event->Signal();}Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) {@@ -753,7 +752,7 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) {core->connected_producer_listener = nullptr;core->connected_api = NativeWindowApi::NoConnectedApi;core->SignalDequeueCondition();- buffer_wait_event->GetWritableEvent().Signal();+ buffer_wait_event->Signal();listener = core->consumer_listener;} else {LOG_ERROR(Service_NVFlinger, "still connected to another api (cur = {} req = {})",@@ -802,7 +801,7 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot,}core->SignalDequeueCondition();- buffer_wait_event->GetWritableEvent().Signal();+ buffer_wait_event->Signal();return Status::NoError;}diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.h b/src/core/hle/service/nvflinger/buffer_queue_producer.hindex 0ba03a568e..7526bf8ece 100644--- a/src/core/hle/service/nvflinger/buffer_queue_producer.h+++ b/src/core/hle/service/nvflinger/buffer_queue_producer.h@@ -24,7 +24,6 @@ namespace Kernel {class KernelCore;class KEvent;class KReadableEvent;-class KWritableEvent;} // namespace Kernelnamespace Service::KernelHelpers {diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.hindex b62615de27..99509bc5bf 100644--- a/src/core/hle/service/nvflinger/nvflinger.h+++ b/src/core/hle/service/nvflinger/nvflinger.h@@ -25,7 +25,6 @@ struct EventType;namespace Kernel {class KReadableEvent;-class KWritableEvent;} // namespace Kernelnamespace Service::Nvidia {diff --git a/src/core/hle/service/ptm/psm.cpp b/src/core/hle/service/ptm/psm.cppindex 2c31e9485f..1ac97fe310 100644--- a/src/core/hle/service/ptm/psm.cpp+++ b/src/core/hle/service/ptm/psm.cpp@@ -37,19 +37,19 @@ public:void SignalChargerTypeChanged() {if (should_signal && should_signal_charger_type) {- state_change_event->GetWritableEvent().Signal();+ state_change_event->Signal();}}void SignalPowerSupplyChanged() {if (should_signal && should_signal_power_supply) {- state_change_event->GetWritableEvent().Signal();+ state_change_event->Signal();}}void SignalBatteryVoltageStateChanged() {if (should_signal && should_signal_battery_voltage) {- state_change_event->GetWritableEvent().Signal();+ state_change_event->Signal();}}diff --git a/src/core/hle/service/time/system_clock_context_update_callback.cpp b/src/core/hle/service/time/system_clock_context_update_callback.cppindex a649bed3a5..cafc04ee72 100644--- a/src/core/hle/service/time/system_clock_context_update_callback.cpp+++ b/src/core/hle/service/time/system_clock_context_update_callback.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include "core/hle/kernel/k_writable_event.h"+#include "core/hle/kernel/k_event.h"#include "core/hle/service/time/errors.h"#include "core/hle/service/time/system_clock_context_update_callback.h"@@ -20,13 +20,13 @@ bool SystemClockContextUpdateCallback::NeedUpdate(const SystemClockContext& valu}void SystemClockContextUpdateCallback::RegisterOperationEvent(- std::shared_ptr<Kernel::KWritableEvent>&& writable_event) {- operation_event_list.emplace_back(std::move(writable_event));+ std::shared_ptr<Kernel::KEvent>&& event) {+ operation_event_list.emplace_back(std::move(event));}void SystemClockContextUpdateCallback::BroadcastOperationEvent() {- for (const auto& writable_event : operation_event_list) {- writable_event->Signal();+ for (const auto& event : operation_event_list) {+ event->Signal();}}diff --git a/src/core/hle/service/time/system_clock_context_update_callback.h b/src/core/hle/service/time/system_clock_context_update_callback.hindex 9c6caf1964..bf657acd9e 100644--- a/src/core/hle/service/time/system_clock_context_update_callback.h+++ b/src/core/hle/service/time/system_clock_context_update_callback.h@@ -9,7 +9,7 @@#include "core/hle/service/time/clock_types.h"namespace Kernel {-class KWritableEvent;+class KEvent;}namespace Service::Time::Clock {@@ -24,7 +24,7 @@ public:bool NeedUpdate(const SystemClockContext& value) const;- void RegisterOperationEvent(std::shared_ptr<Kernel::KWritableEvent>&& writable_event);+ void RegisterOperationEvent(std::shared_ptr<Kernel::KEvent>&& event);void BroadcastOperationEvent();@@ -37,7 +37,7 @@ protected:private:bool has_context{};- std::vector<std::shared_ptr<Kernel::KWritableEvent>> operation_event_list;+ std::vector<std::shared_ptr<Kernel::KEvent>> operation_event_list;};} // namespace Service::Time::Clockdiff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cppindex 288aafaaf6..8ef74f1f09 100644--- a/src/core/hle/service/vi/display/vi_display.cpp+++ b/src/core/hle/service/vi/display/vi_display.cpp@@ -10,7 +10,6 @@#include "core/core.h"#include "core/hle/kernel/k_event.h"#include "core/hle/kernel/k_readable_event.h"-#include "core/hle/kernel/k_writable_event.h"#include "core/hle/service/kernel_helpers.h"#include "core/hle/service/nvdrv/core/container.h"#include "core/hle/service/nvflinger/buffer_item_consumer.h"@@ -74,7 +73,7 @@ Kernel::KReadableEvent* Display::GetVSyncEventUnchecked() {}void Display::SignalVSyncEvent() {- vsync_event->GetWritableEvent().Signal();+ vsync_event->Signal();}void Display::CreateLayer(u64 layer_id, u32 binder_id,