mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-26 13:26:30 -05:00
hle/kernel: Fix data race in GetCurrentHostThreadID
As reported by tsan, host_thread_ids could be read while any of the RegisterHostThread variants were called. To fix this, lock the register mutex when yuzu is running in multicore mode and GetCurrentHostThreadID is called.
This commit is contained in:
parent
4efaecf125
commit
36eade7f4c
1 changed files with 2 additions and 1 deletions
|
@ -219,6 +219,7 @@ struct KernelCore::Impl {
|
||||||
return static_cast<u32>(system.GetCpuManager().CurrentCore());
|
return static_cast<u32>(system.GetCpuManager().CurrentCore());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
std::unique_lock lock{register_thread_mutex};
|
||||||
const auto it = host_thread_ids.find(this_id);
|
const auto it = host_thread_ids.find(this_id);
|
||||||
if (it == host_thread_ids.end()) {
|
if (it == host_thread_ids.end()) {
|
||||||
return Core::INVALID_HOST_THREAD_ID;
|
return Core::INVALID_HOST_THREAD_ID;
|
||||||
|
@ -324,7 +325,7 @@ struct KernelCore::Impl {
|
||||||
std::unordered_map<std::thread::id, u32> host_thread_ids;
|
std::unordered_map<std::thread::id, u32> host_thread_ids;
|
||||||
u32 registered_thread_ids{Core::Hardware::NUM_CPU_CORES};
|
u32 registered_thread_ids{Core::Hardware::NUM_CPU_CORES};
|
||||||
std::bitset<Core::Hardware::NUM_CPU_CORES> registered_core_threads;
|
std::bitset<Core::Hardware::NUM_CPU_CORES> registered_core_threads;
|
||||||
std::mutex register_thread_mutex;
|
mutable std::mutex register_thread_mutex;
|
||||||
|
|
||||||
// Kernel memory management
|
// Kernel memory management
|
||||||
std::unique_ptr<Memory::MemoryManager> memory_manager;
|
std::unique_ptr<Memory::MemoryManager> memory_manager;
|
||||||
|
|
Loading…
Reference in a new issue