archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 14:01:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lv2: Wait for rescheduling before confirming ETIMEOUT

Browse source
This commit is contained in:
Eladash 2019-08-25 10:05:05 +03:00 • committed by Ivan
parent 35a3bed91a
commit a921fe3351
7 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/Cell/lv2/sys_event.cpp
View file

@ -292,6 +292,9 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(queue->mutex); std::lock_guard lock(queue->mutex);
if (!queue->unqueue(queue->sq, &ppu)) if (!queue->unqueue(queue->sq, &ppu))

3
rpcs3/Emu/Cell/lv2/sys_event_flag.cpp
View file

@ -171,6 +171,9 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(flag->mutex); std::lock_guard lock(flag->mutex);
if (!flag->unqueue(flag->sq, &ppu)) if (!flag->unqueue(flag->sq, &ppu))

3
rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
View file

@ -325,6 +325,9 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(cond->mutex); std::lock_guard lock(cond->mutex);
if (!cond->unqueue(cond->sq, &ppu)) if (!cond->unqueue(cond->sq, &ppu))

3
rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp
View file

@ -130,6 +130,9 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout)
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(mutex->mutex); std::lock_guard lock(mutex->mutex);
if (!mutex->unqueue(mutex->sq, &ppu)) if (!mutex->unqueue(mutex->sq, &ppu))

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

@ -165,6 +165,9 @@ error_code sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout)
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(mutex->mutex); std::lock_guard lock(mutex->mutex);
if (!mutex->unqueue(mutex->sq, &ppu)) if (!mutex->unqueue(mutex->sq, &ppu))

6
rpcs3/Emu/Cell/lv2/sys_rwlock.cpp
View file

@ -140,6 +140,9 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(rwlock->mutex); std::lock_guard lock(rwlock->mutex);
if (!rwlock->unqueue(rwlock->rq, &ppu)) if (!rwlock->unqueue(rwlock->rq, &ppu))
@ -337,6 +340,9 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(rwlock->mutex); std::lock_guard lock(rwlock->mutex);
if (!rwlock->unqueue(rwlock->wq, &ppu)) if (!rwlock->unqueue(rwlock->wq, &ppu))

3
rpcs3/Emu/Cell/lv2/sys_semaphore.cpp
View file

@ -131,6 +131,9 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
// Wait for rescheduling
ppu.check_state();
std::lock_guard lock(sem->mutex); std::lock_guard lock(sem->mutex);
if (!sem->unqueue(sem->sq, &ppu)) if (!sem->unqueue(sem->sq, &ppu))