mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 17:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys_cond: Fix spurious EBUSY in sys_cond_destroy

Browse Source 
Increment waiters count inside IDM's mutex lock scope.
This commit is contained in:
Eladash 2020-06-04 13:27:25 +03:00 committed by Ivan
parent a0f0f58fc5
commit 314dc4c5de
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
rpcs3/Emu/Cell/lv2/sys_cond.cpp
View File

@ -205,16 +205,35 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
sys_cond.trace("sys_cond_wait(cond_id=0x%x, timeout=%lld)", cond_id, timeout);
const auto cond = idm::get<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond)
// Further function result
ppu.gpr[3] = CELL_OK;
const auto cond = idm::get<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond) -> s64
{
if (cond.mutex->owner >> 1 == ppu.id)
if (cond.mutex->owner >> 1 != ppu.id)
{
// Add a "promise" to add a waiter
cond.waiters++;
return -1;
}
std::lock_guard lock(cond.mutex->mutex);
// Register waiter
cond.sq.emplace_back(&ppu);
cond.waiters++;
// Unlock the mutex
const auto count = cond.mutex->lock_count.exchange(0);
if (auto cpu = cond.mutex->reown<ppu_thread>())
{
cond.mutex->append(cpu);
}
// Sleep current thread and schedule mutex waiter
cond.sleep(ppu, timeout);
// Save the recursive value
return cond.mutex->lock_count.load();
return count;
});
if (!cond)
@ -222,32 +241,10 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
return CELL_ESRCH;
}
// Verify ownership
if (cond->mutex->owner >> 1 != ppu.id)
if (cond.ret < 0)
{
return CELL_EPERM;
}
else
{
// Further function result
ppu.gpr[3] = CELL_OK;
std::lock_guard lock(cond->mutex->mutex);
// Register waiter
cond->sq.emplace_back(&ppu);
// Unlock the mutex
cond->mutex->lock_count = 0;
if (auto cpu = cond->mutex->reown<ppu_thread>())
{
cond->mutex->append(cpu);
}
// Sleep current thread and schedule mutex waiter
cond->sleep(ppu, timeout);
}
while (!ppu.state.test_and_reset(cpu_flag::signal))
{