Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-03 23:38:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

IOS/EmulationKernel: Remove m_device_map_mutex, m_device_map is only modified in the constructor and destructor.

Browse source
This commit is contained in:
Admiral H. Curtiss 2023-05-15 20:54:21 +02:00
parent b8f3a47fba
commit 28b82ff8d8
No known key found for this signature in database
GPG key ID: F051B4C4044F33FB
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Core/IOS/IOS.cpp
View file

@ -8,7 +8,6 @@
#include <deque> #include <deque>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex>
#include <string> #include <string>
#include <utility> #include <utility>
@ -346,7 +345,6 @@ EmulationKernel::~EmulationKernel()
{ {
Core::System::GetInstance().GetCoreTiming().RemoveAllEvents(s_event_enqueue); Core::System::GetInstance().GetCoreTiming().RemoveAllEvents(s_event_enqueue);
std::lock_guard lock(m_device_map_mutex);
m_device_map.clear(); m_device_map.clear();
m_socket_manager.reset(); m_socket_manager.reset();
} }
@ -558,8 +556,6 @@ void EmulationKernel::AddDevice(std::unique_ptr<Device> device)
void EmulationKernel::AddStaticDevices() void EmulationKernel::AddStaticDevices()
{ {
std::lock_guard lock(m_device_map_mutex);
const Feature features = GetFeatures(GetVersion()); const Feature features = GetFeatures(GetVersion());
// Dolphin-specific device for letting homebrew access and alter emulator state. // Dolphin-specific device for letting homebrew access and alter emulator state.
@ -648,7 +644,6 @@ s32 EmulationKernel::GetFreeDeviceID()
std::shared_ptr<Device> EmulationKernel::GetDeviceByName(std::string_view device_name) std::shared_ptr<Device> EmulationKernel::GetDeviceByName(std::string_view device_name)
{ {
std::lock_guard lock(m_device_map_mutex);
const auto iterator = m_device_map.find(device_name); const auto iterator = m_device_map.find(device_name);
return iterator != m_device_map.end() ? iterator->second : nullptr; return iterator != m_device_map.end() ? iterator->second : nullptr;
} }

2
Source/Core/Core/IOS/IOS.h
View file

@ -7,7 +7,6 @@
#include <deque> #include <deque>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex>
#include <optional> #include <optional>
#include <string> #include <string>
#include <string_view> #include <string_view>
@ -198,7 +197,6 @@ private:
static constexpr u8 IPC_MAX_FDS = 0x18; static constexpr u8 IPC_MAX_FDS = 0x18;
std::map<std::string, std::shared_ptr<Device>, std::less<>> m_device_map; std::map<std::string, std::shared_ptr<Device>, std::less<>> m_device_map;
std::mutex m_device_map_mutex;
// TODO: make this fdmap per process. // TODO: make this fdmap per process.
std::array<std::shared_ptr<Device>, IPC_MAX_FDS> m_fdmap; std::array<std::shared_ptr<Device>, IPC_MAX_FDS> m_fdmap;