diff options
| author | LC <mathew1800@gmail.com> | 2020-10-28 04:54:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 04:54:35 -0400 |
| commit | 46265b72a2e3989613dcf3ed7f6b761d6c930888 (patch) | |
| tree | 205db966bb24dd0e0869a07716f6248ec62cb138 /src/core/hle/kernel/kernel.cpp | |
| parent | eeae1ec2b63971981238067935d8049128569e3b (diff) | |
| parent | 1a1ca86eb5fd29c8b4c1f3a4e9093b964642c898 (diff) | |
Merge pull request #4851 from ReinUsesLisp/core-threads-race
hle/kernel: Remove unused registered_core_threads to fix data races
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b2b5b8adf9..bb3e312a7b 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -86,8 +86,6 @@ struct KernelCore::Impl { } cores.clear(); - registered_core_threads.reset(); - process_list.clear(); current_process = nullptr; @@ -199,9 +197,7 @@ struct KernelCore::Impl { const auto it = std::find(register_host_thread_keys.begin(), end, this_id); ASSERT(core_id < Core::Hardware::NUM_CPU_CORES); ASSERT(it == end); - ASSERT(!registered_core_threads[core_id]); InsertHostThread(static_cast<u32>(core_id)); - registered_core_threads.set(core_id); } void RegisterHostThread() { @@ -332,7 +328,6 @@ struct KernelCore::Impl { // 0-3 IDs represent core threads, >3 represent others std::atomic<u32> registered_thread_ids{Core::Hardware::NUM_CPU_CORES}; - std::bitset<Core::Hardware::NUM_CPU_CORES> registered_core_threads; // Number of host threads is a relatively high number to avoid overflowing static constexpr size_t NUM_REGISTRABLE_HOST_THREADS = 64; |
