archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +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

14
rpcs3/Emu/Cell/lv2/sys_timer.cpp
View file

@ -30,7 +30,7 @@ void lv2_timer::on_task()
if (_now >= next)
{
semaphore_lock lock(mutex);
std::lock_guard lock(mutex);
if (const auto queue = port.lock())
{
@ -91,7 +91,7 @@ error_code sys_timer_destroy(u32 timer_id)
const auto timer = idm::withdraw<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer) -> CellError
{
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
if (!timer.port.expired())
{
@ -120,7 +120,7 @@ error_code sys_timer_get_information(u32 timer_id, vm::ptr<sys_timer_information
const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer)
{
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
info->next_expire = timer.expire;
info->period = timer.period;
@ -155,7 +155,7 @@ error_code _sys_timer_start(u32 timer_id, u64 base_time, u64 period)
const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer) -> CellError
{
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
if (timer.state != SYS_TIMER_STATE_STOP)
{
@ -194,7 +194,7 @@ error_code sys_timer_stop(u32 timer_id)
const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [](lv2_timer& timer)
{
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
timer.state = SYS_TIMER_STATE_STOP;
});
@ -220,7 +220,7 @@ error_code sys_timer_connect_event_queue(u32 timer_id, u32 queue_id, u64 name, u
return CELL_ESRCH;
}
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
if (!timer.port.expired())
{
@ -254,7 +254,7 @@ error_code sys_timer_disconnect_event_queue(u32 timer_id)
const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [](lv2_timer& timer) -> CellError
{
semaphore_lock lock(timer.mutex);
std::lock_guard lock(timer.mutex);
if (timer.port.expired())
{