RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

Make cpu_counter::remove() async

Browse Source 
Remove both mutex and assertion from it.
This commit is contained in:
Nekotekina 2020-11-30 03:48:09 +03:00
parent cad3a6c547
commit 32f39fec1c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/Emu/CPU/CPUThread.cpp
View File

@ -337,17 +337,13 @@ namespace cpu_counter
return; return;
} }
// Unregister and wait if necessary
verify(HERE), _this->state & cpu_flag::wait;
if (slot >= std::size(s_cpu_list)) if (slot >= std::size(s_cpu_list))
{ {
sys_log.fatal("Index out of bounds (%u)." HERE, slot); sys_log.fatal("Index out of bounds (%u)." HERE, slot);
return; return;
} }
std::lock_guard lock(s_cpu_lock); // Asynchronous unregister
if (!s_cpu_list[slot].compare_and_swap_test(_this, nullptr)) if (!s_cpu_list[slot].compare_and_swap_test(_this, nullptr))
{ {
sys_log.fatal("Inconsistency for array slot %u", slot); sys_log.fatal("Inconsistency for array slot %u", slot);
@ -519,6 +515,8 @@ void cpu_thread::operator()()
cpu_counter::remove(_this); cpu_counter::remove(_this);
} }
s_cpu_lock.lock_unlock();
s_cpu_counter--; s_cpu_counter--;
g_tls_current_cpu_thread = nullptr; g_tls_current_cpu_thread = nullptr;
@ -592,7 +590,7 @@ bool cpu_thread::check_state() noexcept
{ {
bool store = false; bool store = false;
if (flags & cpu_flag::pause) if (flags & cpu_flag::pause && s_tls_thread_slot != umax)
{ {
// Save value before state is saved and cpu_flag::wait is observed // Save value before state is saved and cpu_flag::wait is observed
if (s_tls_sctr == umax) if (s_tls_sctr == umax)
@ -614,6 +612,13 @@ bool cpu_thread::check_state() noexcept
} }
else else
{ {
// Cleanup after asynchronous remove()
if (flags & cpu_flag::pause && s_tls_thread_slot == umax)
{
flags -= cpu_flag::pause;
store = true;
}
s_tls_sctr = -1; s_tls_sctr = -1;
} }