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

Cleanup semaphore<> (sema.h) and mutex.h (shared_mutex)

Browse source 
Remove semaphore_lock and writer_lock classes, replace with std::lock_guard
Change semaphore<> interface to Lockable (+ exotic try_unlock method)
This commit is contained in:
Nekotekina 2018-09-03 22:28:33 +03:00
parent 5e556a87ff
commit ca5158a03e
50 changed files with 283 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Cell/lv2/sys_cond.cpp
View file

@ -80,7 +80,7 @@ error_code sys_cond_signal(ppu_thread& ppu, u32 cond_id)
{
if (cond.waiters)
{
semaphore_lock lock(cond.mutex->mutex);
std::lock_guard lock(cond.mutex->mutex);
if (const auto cpu = cond.schedule<ppu_thread>(cond.sq, cond.mutex->protocol))
{
@ -119,7 +119,7 @@ error_code sys_cond_signal_all(ppu_thread& ppu, u32 cond_id)
if (cond.waiters)
{
semaphore_lock lock(cond.mutex->mutex);
std::lock_guard lock(cond.mutex->mutex);
while (const auto cpu = cond.schedule<ppu_thread>(cond.sq, cond.mutex->protocol))
{
@ -156,7 +156,7 @@ error_code sys_cond_signal_to(ppu_thread& ppu, u32 cond_id, u32 thread_id)
{
if (cond.waiters)
{
semaphore_lock lock(cond.mutex->mutex);
std::lock_guard lock(cond.mutex->mutex);
for (auto cpu : cond.sq)
{
@ -221,7 +221,7 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
}
else
{
semaphore_lock lock(cond->mutex->mutex);
std::lock_guard lock(cond->mutex->mutex);
// Register waiter
cond->sq.emplace_back(&ppu);
@ -247,7 +247,7 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
if (passed >= timeout)
{
semaphore_lock lock(cond->mutex->mutex);
std::lock_guard lock(cond->mutex->mutex);
// Try to cancel the waiting
if (cond->unqueue(cond->sq, &ppu))