octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hle: kernel: service_thread: Take reference to KServerSession on service request.

This commit is contained in:
bunnei 2021-05-20 22:39:44 -07:00
parent e33ffdc555
commit 6418a42884
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/hle/kernel/service_thread.cpp
View File

@ -74,21 +74,17 @@ void ServiceThread::Impl::QueueSyncRequest(KSession& session,
{
std::unique_lock lock{queue_mutex};
auto* server_session{&session.GetServerSession()};
// Open a reference to the session to ensure it is not closes while the service request
// completes asynchronously.
session.Open();
server_session->Open();
requests.emplace([session_ptr{&session}, context{std::move(context)}]() {
requests.emplace([server_session, context{std::move(context)}]() {
// Close the reference.
SCOPE_EXIT({ session_ptr->Close(); });
// If the session has been closed, we are done.
if (session_ptr->IsServerClosed()) {
return;
}
SCOPE_EXIT({ server_session->Close(); });
// Complete the service request.
KScopedAutoObject server_session{&session_ptr->GetServerSession()};
server_session->CompleteSyncRequest(*context);
});
}