Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sys_lwcond: Fix rare race on mode 3 signal (#12413)

Browse Source
This commit is contained in:
Elad Ashkenazi
2022-08-04 14:13:51 +03:00
committed by GitHub
parent 3e923b4993
commit 0e1931f178
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
+8 -2
View File
@@ -165,13 +165,19 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u6
{ {
// Respect ordering of the sleep queue // Respect ordering of the sleep queue
mutex->sq.emplace_back(result); mutex->sq.emplace_back(result);
result = mutex->schedule<ppu_thread>(mutex->sq, mutex->protocol); auto result2 = mutex->schedule<ppu_thread>(mutex->sq, mutex->protocol);
if (static_cast<ppu_thread*>(result)->state & cpu_flag::again) if (static_cast<ppu_thread*>(result2)->state & cpu_flag::again)
{ {
ppu.state += cpu_flag::again; ppu.state += cpu_flag::again;
return 0; return 0;
} }
if (result2 != result)
{
cond.awake(result2);
result = nullptr;
}
} }
else if (mode == 1) else if (mode == 1)
{ {