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

Revert "Remove shared_cond and simplify reservation waiting"

Browse source 
This reverts commit 0a96497e13.
This commit is contained in:
Nekotekina 2019-09-13 23:54:43 +03:00
parent c9170bbb88
commit b70c08a2e8
7 changed files with 349 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -2385,6 +2385,13 @@ s64 spu_thread::get_ch_value(u32 ch)
fmt::throw_exception("Not supported: event mask 0x%x" HERE, mask1);
}
const auto pseudo_lock = vm::reservation_notifier(raddr, 128).try_shared_lock();
if (!pseudo_lock)
{
fmt::throw_exception("Unexpected: reservation notifier lock failed");
}
while (res = get_events(), !res)
{
state += cpu_flag::wait;
@ -2394,7 +2401,7 @@ s64 spu_thread::get_ch_value(u32 ch)
return -1;
}
vm::reservation_notifier(raddr, 128).wait<UINT64_MAX & -128>(rtime, atomic_wait_timeout{30000});
pseudo_lock.wait(100);
}
check_state();