mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-29 09:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timer state after event queue was destroyed

Browse Source 
* Hw tests show state is unaffected by external destruction of the event queue

* Minor race regarding state check fixed (can result in an undestroyable state)
This commit is contained in:
eladash 2019-03-26 21:08:49 +02:00 committed by Ivan
parent 90490f775d
commit 3c0564c9b7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
@ -33,17 +33,17 @@ void lv2_timer_context::operator()()
if (const auto queue = port.lock()) if (const auto queue = port.lock())
{ {
queue->send(source, data1, data2, next); queue->send(source, data1, data2, next);
if (period)
{
// Set next expiration time and check again (HACK)
expire += period;
continue;
}
} }
// Stop: oneshot or the event port was disconnected (TODO: is it correct?) if (period)
state = SYS_TIMER_STATE_STOP; {
// Set next expiration time and check again (HACK)
expire += period;
continue;
}
// Stop after oneshot
state.compare_and_swap_test(SYS_TIMER_STATE_RUN, SYS_TIMER_STATE_STOP);
continue; continue;
} }