Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4145 from unknownbrackets/shutdown

Browse source 
More shutdown tweaks
This commit is contained in:
Henrik Rydgård 2013-10-12 11:17:21 -07:00
commit 82c56dccff
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/HLE/sceIo.cpp
View file

@ -435,6 +435,7 @@ void __IoManagerThread() {
}
void __IoWakeManager() {
ioManagerThreadEnabled = false;
ioManager.FinishEventLoop();
ioManager.SyncThread();
}

29
Core/System.cpp
View file

@ -95,23 +95,31 @@ bool IsOnSeparateCPUThread() {
}
}
void CPU_SetState(CPUThreadState to) {
lock_guard guard(cpuThreadLock);
cpuThreadState = to;
cpuThreadCond.notify_one();
cpuThreadReplyCond.notify_one();
}
bool CPU_NextState(CPUThreadState from, CPUThreadState to) {
lock_guard guard(cpuThreadLock);
if (cpuThreadState == from) {
cpuThreadState = to;
cpuThreadCond.notify_one();
cpuThreadReplyCond.notify_one();
CPU_SetState(to);
return true;
} else {
return false;
}
}
void CPU_SetState(CPUThreadState to) {
bool CPU_NextStateNot(CPUThreadState from, CPUThreadState to) {
lock_guard guard(cpuThreadLock);
cpuThreadState = to;
cpuThreadCond.notify_one();
cpuThreadReplyCond.notify_one();
if (cpuThreadState != from) {
CPU_SetState(to);
return true;
} else {
return false;
}
}
bool CPU_IsReady() {
@ -261,8 +269,13 @@ void Core_UpdateState(CoreState newState) {
}
void System_Wake() {
if (CPU_IsReady()) {
CPU_NextStateNot(CPU_THREAD_NOT_RUNNING, CPU_THREAD_SHUTDOWN);
CPU_WaitStatus(cpuThreadReplyCond, &CPU_IsShutdown);
}
if (gpu) {
gpu->FinishEventLoop();
gpu->SyncThread();
}
}
@ -302,7 +315,7 @@ void PSP_Shutdown() {
Core_UpdateState(CORE_ERROR);
Core_NotifyShutdown();
if (cpuThread != NULL) {
CPU_SetState(CPU_THREAD_SHUTDOWN);
CPU_NextStateNot(CPU_THREAD_NOT_RUNNING, CPU_THREAD_SHUTDOWN);
CPU_WaitStatus(cpuThreadReplyCond, &CPU_IsShutdown);
delete cpuThread;
cpuThread = 0;