mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-10 15:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

LV2/Timer: Make timers consistent

Browse Source
This commit is contained in:
Eladash 2023-04-29 08:12:59 +03:00 committed by Ivan
parent b861a9c5d0
commit 49be6be8f4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,15 +48,14 @@ void lv2_timer::save(utils::serial& ar)
ar(state), lv2_event_queue::save_ptr(ar, port.get()), ar(source, data1, data2, expire, period); ar(state), lv2_event_queue::save_ptr(ar, port.get()), ar(source, data1, data2, expire, period);
} }
u64 lv2_timer::check() noexcept u64 lv2_timer::check(u64 _now) noexcept
{ {
while (thread_ctrl::state() != thread_state::aborting) while (true)
{ {
const u32 _state = +state; const u32 _state = +state;
if (_state == SYS_TIMER_STATE_RUN) if (_state == SYS_TIMER_STATE_RUN)
{ {
const u64 _now = get_guest_system_time();
u64 next = expire; u64 next = expire;
// If aborting, perform the last accurate check for event // If aborting, perform the last accurate check for event
@ -83,7 +82,7 @@ u64 lv2_timer::check_unlocked(u64 _now) noexcept
if (_now < next || state != SYS_TIMER_STATE_RUN) if (_now < next || state != SYS_TIMER_STATE_RUN)
{ {
return; return umax;
} }
if (port) if (port)
@ -95,7 +94,7 @@ u64 lv2_timer::check_unlocked(u64 _now) noexcept
{ {
// Set next expiration time and check again // Set next expiration time and check again
const u64 expire0 = utils::add_saturate<u64>(next, period); const u64 expire0 = utils::add_saturate<u64>(next, period);
expire.release(_expire0); expire.release(expire0);
return expire0 - _now; return expire0 - _now;
} }
@ -134,13 +133,15 @@ void lv2_timer_thread::operator()()
continue; continue;
} }
const u64 _now = get_guest_system_time();
reader_lock lock(mutex); reader_lock lock(mutex);
for (const auto& timer : timers) for (const auto& timer : timers)
{ {
if (lv2_obj::check(timer)) if (lv2_obj::check(timer))
{ {
const u64 advised_sleep_time = timer->check(); const u64 advised_sleep_time = timer->check(_now);
if (sleep_time > advised_sleep_time) if (sleep_time > advised_sleep_time)
{ {

2
rpcs3/Emu/Cell/lv2/sys_timer.h
View File

@ -36,7 +36,7 @@ struct lv2_timer : lv2_obj
atomic_t<u64> expire{0}; // Next expiration time atomic_t<u64> expire{0}; // Next expiration time
atomic_t<u64> period{0}; // Period (oneshot if 0) atomic_t<u64> period{0}; // Period (oneshot if 0)
u64 check() noexcept; u64 check(u64 _now) noexcept;
u64 check_unlocked(u64 _now) noexcept; u64 check_unlocked(u64 _now) noexcept;
lv2_timer() noexcept lv2_timer() noexcept