diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-08-26 03:45:51 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-08-26 04:52:50 +0200 |
commit | 36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85 (patch) | |
tree | e1da56066795a232d4f23f4c33e0d758943dfaa8 /src | |
parent | Merge pull request #4572 from lioncash/xbyak (diff) | |
download | yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar.gz yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar.bz2 yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar.lz yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar.xz yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.tar.zst yuzu-36eade7f4ccf5a7da8e9f5e7ec32d2e4f8660e85.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index cabe8d418..f2b0fe2fd 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -219,6 +219,7 @@ struct KernelCore::Impl { return static_cast<u32>(system.GetCpuManager().CurrentCore()); } } + std::unique_lock lock{register_thread_mutex}; const auto it = host_thread_ids.find(this_id); if (it == host_thread_ids.end()) { return Core::INVALID_HOST_THREAD_ID; @@ -324,7 +325,7 @@ struct KernelCore::Impl { std::unordered_map<std::thread::id, u32> host_thread_ids; u32 registered_thread_ids{Core::Hardware::NUM_CPU_CORES}; std::bitset<Core::Hardware::NUM_CPU_CORES> registered_core_threads; - std::mutex register_thread_mutex; + mutable std::mutex register_thread_mutex; // Kernel memory management std::unique_ptr<Memory::MemoryManager> memory_manager; |