mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellSysutilCheckCallback fix

Browse Source
This commit is contained in:
Nekotekina 2016-08-04 22:13:01 +03:00
parent dcd2bbaa3d
commit f7dcaa4a68
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rpcs3/Emu/Cell/Modules/cellSysutil.cpp
View File

@ -20,6 +20,22 @@ struct sysutil_cb_manager
std::array<std::pair<vm::ptr<CellSysutilCallback>, vm::ptr<void>>, 4> callbacks; std::array<std::pair<vm::ptr<CellSysutilCallback>, vm::ptr<void>>, 4> callbacks;
std::queue<std::function<s32(ppu_thread&)>> registered; std::queue<std::function<s32(ppu_thread&)>> registered;
std::function<s32(ppu_thread&)> get_cb()
{
std::lock_guard<std::mutex> lock(mutex);
if (registered.empty())
{
return nullptr;
}
auto func = std::move(registered.front());
registered.pop();
return func;
}
}; };
extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&& cb) extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&& cb)
@ -211,23 +227,14 @@ s32 cellSysutilCheckCallback(ppu_thread& ppu)
const auto cbm = fxm::get_always<sysutil_cb_manager>(); const auto cbm = fxm::get_always<sysutil_cb_manager>();
while (true) while (auto&& func = cbm->get_cb())
{ {
std::lock_guard<std::mutex> lock(cbm->mutex);
if (cbm->registered.empty())
{
break;
}
const auto func = std::move(cbm->registered.front());
cbm->registered.pop();
if (s32 res = func(ppu)) if (s32 res = func(ppu))
{ {
return res; return res;
} }
CHECK_EMU_STATUS;
} }
return CELL_OK; return CELL_OK;