RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 12:42:41 +01:00
Code Issues Releases Wiki Activity

Fix sys_rwlock_wlock timedout event

Browse Source 
If the rwlock is currently acquired by a writer signaling readers is wrong and will lead to EPERM for wunlock!
Only signal blocked readers if the rwlock is currently acquired by readers
This commit is contained in:
eladash 2019-05-02 17:49:23 +03:00 committed by kd-11
parent ca08418dc1
commit 4e2650af91
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/lv2/sys_rwlock.cpp
View File

@ -343,10 +343,12 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
continue;
}
// If the last waiter quit the writer sleep queue, readers must acquire the lock
if (!rwlock->rq.empty() && rwlock->wq.empty())
// If the last waiter quit the writer sleep queue, wake blocked readers
if (!rwlock->rq.empty() && rwlock->wq.empty() && rwlock->owner < 0)
{
rwlock->owner = (s64{-2} * rwlock->rq.size()) | 1;
verify(HERE), rwlock->owner & 1;
rwlock->owner -= s64{2} * rwlock->rq.size();
while (auto cpu = rwlock->schedule<ppu_thread>(rwlock->rq, SYS_SYNC_PRIORITY))
{