RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-18 04:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Audio decoding

Browse source
This commit is contained in:
Nekotekina 2014-03-19 04:32:23 +04:00
parent c4d9223034
commit 38bfbe2c40
11 changed files with 355 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

37
rpcs3/Emu/SysCalls/lv2/SC_Condition.cpp
View file

@ -160,22 +160,44 @@ int sys_cond_wait(u32 cond_id, u64 timeout)
if (mutex->m_mutex.GetOwner() != tid)
{
sys_cond.Warning("sys_cond_wait(cond_id=%d) failed (EPERM)", cond_id);
return CELL_EPERM;
}
cond->m_queue.push(tid);
if (mutex->recursive != 1)
{
sys_cond.Warning("sys_cond_wait(cond_id=%d): associated mutex had wrong recursive value (%d)", cond_id, mutex->recursive);
}
mutex->recursive = 0;
mutex->m_mutex.unlock(tid);
mutex->m_mutex.unlock(tid, mutex->protocol == SYS_SYNC_PRIORITY ? mutex->m_queue.pop_prio() : mutex->m_queue.pop());
u32 counter = 0;
const u32 max_counter = timeout ? (timeout / 1000) : ~0;
while (true)
{
if (cond->signal.GetOwner() == tid)
if (cond->signal.unlock(tid, tid) == SMR_OK)
{
mutex->m_mutex.lock(tid);
if (SMutexResult res = mutex->m_mutex.trylock(tid))
{
if (res != SMR_FAILED)
{
goto abort;
}
mutex->m_queue.push(tid);
switch (mutex->m_mutex.lock(tid))
{
case SMR_OK:
mutex->m_queue.invalidate(tid);
case SMR_SIGNAL:
break;
default:
goto abort;
}
}
mutex->recursive = 1;
cond->signal.unlock(tid);
return CELL_OK;
@ -186,13 +208,16 @@ int sys_cond_wait(u32 cond_id, u64 timeout)
if (counter++ > max_counter)
{
cond->m_queue.invalidate(tid);
GetCurrentPPUThread().owned_mutexes--;
GetCurrentPPUThread().owned_mutexes--; // ???
return CELL_ETIMEDOUT;
}
if (Emu.IsStopped())
{
ConLog.Warning("sys_cond_wait(id=%d) aborted", cond_id);
return CELL_OK;
goto abort;
}
}
abort:
ConLog.Warning("sys_cond_wait(id=%d) aborted", cond_id);
return CELL_OK;
}