thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Listen for shutdown in thread loops.

Browse source 
This way we don't need to use wait_for(), much better.
Also because there are slightly more correct cond vars on win32.
This commit is contained in:
Unknown W. Brackets 2013-09-28 00:45:30 -07:00
parent 4b9056fa02
commit 086294b495
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Core/System.cpp
View file

@ -124,7 +124,7 @@ bool CPU_HasPendingAction() {
void CPU_WaitStatus(bool (*pred)()) {
cpuThreadLock.lock();
while (!pred())
cpuThreadCond.wait_for(cpuThreadLock, 16);
cpuThreadCond.wait(cpuThreadLock);
cpuThreadLock.unlock();
}
@ -255,6 +255,12 @@ void Core_UpdateState(CoreState newState) {
Core_UpdateSingleStep();
}
void System_Wake() {
if (gpu) {
gpu->FinishEventLoop();
}
}
bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) {
INFO_LOG(BOOT, "PPSSPP %s", PPSSPP_GIT_VERSION);
@ -262,6 +268,7 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) {
coreParameter.errorString = "";
if (g_Config.bSeparateCPUThread) {
Core_ListenShutdown(System_Wake);
CPU_SetState(CPU_THREAD_PENDING);
cpuThread = new std::thread(&CPU_RunLoop);
CPU_WaitStatus(&CPU_IsReady);
@ -286,9 +293,9 @@ bool PSP_IsInited() {
}
void PSP_Shutdown() {
Core_NotifyShutdown();
if (coreState == CORE_RUNNING)
Core_UpdateState(CORE_ERROR);
Core_NotifyShutdown();
if (cpuThread != NULL) {
CPU_SetState(CPU_THREAD_SHUTDOWN);
CPU_WaitStatus(&CPU_IsShutdown);