mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-14 06:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling lv2_obj::sleep sequantially in sceNpTrophyRegisterContext

Browse Source 
Also fix a correctness issue with queued.
This commit is contained in:
Eladash 2019-09-21 14:43:12 +03:00 committed by Megamouse
parent 3b06214f88
commit 038c6bb234
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
View File

@ -17,7 +17,6 @@
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "Emu/Cell/lv2/sys_timer.h"
LOG_CHANNEL(sceNpTrophy); LOG_CHANNEL(sceNpTrophy);
@ -413,30 +412,41 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
{ SCE_NP_TROPHY_STATUS_PROCESSING_COMPLETE, 0 } { SCE_NP_TROPHY_STATUS_PROCESSING_COMPLETE, 0 }
}; };
static atomic_t<u32> queued; lv2_obj::sleep(ppu);
// Create a counter which is destroyed after the function ends
const auto queued = std::make_shared<atomic_t<u32>>(0);
std::weak_ptr<atomic_t<u32>> wkptr = queued;
queued = 0;
for (auto status : statuses) for (auto status : statuses)
{ {
// One status max per cellSysutilCheckCallback call // One status max per cellSysutilCheckCallback call
queued += status.second; *queued += status.second;
for (u32 completed = 0; completed <= status.second; completed++) for (u32 completed = 0; completed <= status.second; completed++)
{ {
sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32 sysutil_register_cb([statusCb, status, context, completed, arg, wkptr](ppu_thread& cb_ppu) -> s32
{ {
statusCb(cb_ppu, context, status.first, completed, status.second, arg); statusCb(cb_ppu, context, status.first, completed, status.second, arg);
queued--;
const auto queued = wkptr.lock();
if (queued && (*queued)-- == 1)
{
queued->notify_one();
}
return 0; return 0;
}); });
} }
u32 passed_time=0;
while (queued)
{
sys_timer_usleep(ppu, 5000);
passed_time += 5;
// If too much time passes just send the rest of the events anyway // If too much time passes just send the rest of the events anyway
if (passed_time > 300) break; if (const u32 val = *queued)
{
queued->wait(val, atomic_wait_timeout{300000});
}
if (ppu.is_stopped())
{
return 0;
} }
} }