ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sys_timer_destroy 

Also some cleanup.
This commit is contained in:
Eladash 2020-02-29 11:41:16 +02:00 committed by Ivan
parent 34a0c3f488
commit 5a73943be6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/Cell/lv2/sys_timer.cpp
View File

@ -16,11 +16,9 @@ extern u64 get_guest_system_time();
void lv2_timer_context::operator()()
{
while (!Emu.IsStopped())
while (thread_ctrl::state() != thread_state::aborting)
{
const u32 _state = state;
if (_state == SYS_TIMER_STATE_RUN)
if (state == SYS_TIMER_STATE_RUN)
{
const u64 _now = get_guest_system_time();
const u64 next = expire;
@ -42,21 +40,16 @@ void lv2_timer_context::operator()()
}
// Stop after oneshot
state.compare_and_swap_test(SYS_TIMER_STATE_RUN, SYS_TIMER_STATE_STOP);
state.release(SYS_TIMER_STATE_STOP);
continue;
}
// TODO: use single global dedicated thread for busy waiting, no timer threads
lv2_obj::wait_timeout(next - _now);
continue;
}
else if (_state == SYS_TIMER_STATE_STOP)
{
thread_ctrl::wait_for(10000);
}
else
{
break;
}
thread_ctrl::wait_for(10000);
}
}
@ -83,13 +76,12 @@ error_code sys_timer_destroy(ppu_thread& ppu, u32 timer_id)
const auto timer = idm::withdraw<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer) -> CellError
{
std::lock_guard lock(timer.mutex);
if (!timer.port.expired())
if (std::shared_lock lock(timer.mutex); !timer.port.expired())
{
return CELL_EISCONN;
}
timer = thread_state::aborting;
return {};
});