From 182137a9a4b09c8188d2cbffa312550c5dc83641 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 2 Jan 2024 18:29:03 -0500 Subject: am: migrate global state to per-applet state structure --- src/core/hle/service/am/applet_message_queue.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/am/applet_message_queue.cpp') diff --git a/src/core/hle/service/am/applet_message_queue.cpp b/src/core/hle/service/am/applet_message_queue.cpp index e4931031d..5ed996b70 100644 --- a/src/core/hle/service/am/applet_message_queue.cpp +++ b/src/core/hle/service/am/applet_message_queue.cpp @@ -26,11 +26,15 @@ Kernel::KReadableEvent& AppletMessageQueue::GetOperationModeChangedEvent() { } void AppletMessageQueue::PushMessage(AppletMessage msg) { - messages.push(msg); + { + std::scoped_lock lk{lock}; + messages.push(msg); + } on_new_message->Signal(); } AppletMessageQueue::AppletMessage AppletMessageQueue::PopMessage() { + std::scoped_lock lk{lock}; if (messages.empty()) { on_new_message->Clear(); return AppletMessage::None; @@ -44,6 +48,7 @@ AppletMessageQueue::AppletMessage AppletMessageQueue::PopMessage() { } std::size_t AppletMessageQueue::GetMessageCount() const { + std::scoped_lock lk{lock}; return messages.size(); } -- cgit v1.2.3