RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

sys_lwmutex/mutex: Fix race on lock timeout

Browse source
This commit is contained in:
Eladash 2023-03-18 11:36:55 +02:00 • committed by Ivan
parent f57c8c1c35
commit b844aecb9e
5 changed files with 95 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

32
rpcs3/Emu/Cell/lv2/sys_mutex.cpp
View file

@ -245,12 +245,38 @@ error_code sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout)
std::lock_guard lock(mutex->mutex);
if (!mutex->unqueue(mutex->control.raw().sq, &ppu))
bool success = false;
mutex->control.fetch_op([&](lv2_mutex::control_data_t& data)
{
break;
success = false;
ppu_thread* sq = static_cast<ppu_thread*>(data.sq);
const bool retval = &ppu == sq;
if (!mutex->unqueue<false>(sq, &ppu))
{
return false;
}
success = true;
if (!retval)
{
return false;
}
data.sq = sq;
return true;
});
if (success)
{
ppu.next_cpu = nullptr;
ppu.gpr[3] = CELL_ETIMEDOUT;
}
ppu.gpr[3] = CELL_ETIMEDOUT;
break;
}
}