archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SC_Event_flag: test passed

Browse source
This commit is contained in:
Nekotekina 2014-06-26 18:17:07 +04:00
parent 394b698e92
commit 458322e548
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp
View file

@ -142,8 +142,6 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
{ {
SMutexLocker lock(ef->m_mutex); SMutexLocker lock(ef->m_mutex);
ef->signal.unlock(tid);
u64 flags = ef->flags; u64 flags = ef->flags;
for (u32 i = 0; i < ef->waiters.size(); i++) for (u32 i = 0; i < ef->waiters.size(); i++)
@ -161,6 +159,17 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
ef->flags = 0; ef->flags = 0;
} }
if (u32 target = ef->check())
{
// if signal, leave both mutexes locked...
ef->signal.unlock(tid, target);
ef->m_mutex.unlock(tid, target);
}
else
{
ef->signal.unlock(tid);
}
if (result.IsGood()) if (result.IsGood())
{ {
result = flags; result = flags;
@ -175,6 +184,7 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
} }
} }
ef->signal.unlock(tid);
return CELL_ECANCELED; return CELL_ECANCELED;
} }