VERY experimental Nintendo Switch 2 emulator
C++
nvservices: close map handles on session close
Liamcc7a7b5253d8
diff --git a/src/core/hle/service/nvdrv/core/container.cpp b/src/core/hle/service/nvdrv/core/container.cppindex 21ef57d277..dc1b4d5be6 100644--- a/src/core/hle/service/nvdrv/core/container.cpp+++ b/src/core/hle/service/nvdrv/core/container.cpp@@ -112,6 +112,7 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {void Container::CloseSession(SessionId session_id) {std::scoped_lock lk(impl->session_guard);+ impl->file.UnmapAllHandles(session_id);auto& session = impl->sessions[session_id.id];auto& smmu = impl->host1x.MemoryManager();if (session.has_preallocated_area) {diff --git a/src/core/hle/service/nvdrv/core/nvmap.cpp b/src/core/hle/service/nvdrv/core/nvmap.cppindex 1b59c6b15a..bc1c033c66 100644--- a/src/core/hle/service/nvdrv/core/nvmap.cpp+++ b/src/core/hle/service/nvdrv/core/nvmap.cpp@@ -326,4 +326,17 @@ std::optional<NvMap::FreeInfo> NvMap::FreeHandle(Handle::Id handle, bool internareturn freeInfo;}+void NvMap::UnmapAllHandles(NvCore::SessionId session_id) {+ auto handles_copy = [&] {+ std::scoped_lock lk{handles_lock};+ return handles;+ }();++ for (auto& [id, handle] : handles_copy) {+ if (handle->session_id.id == session_id.id) {+ FreeHandle(id, false);+ }+ }+}+} // namespace Service::Nvidia::NvCorediff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.hindex d7f6958450..b8be599ae9 100644--- a/src/core/hle/service/nvdrv/core/nvmap.h+++ b/src/core/hle/service/nvdrv/core/nvmap.h@@ -152,6 +152,8 @@ public:*/std::optional<FreeInfo> FreeHandle(Handle::Id handle, bool internal_session);+ void UnmapAllHandles(NvCore::SessionId session_id);+private:std::list<std::shared_ptr<Handle>> unmap_queue{};std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`