ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Thread: Make GBAThreadInterrupt thread-safe

This commit is contained in:
Jeffrey Pfau 2014-11-08 04:28:16 -08:00
parent 190ea71646
commit f008c68761
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gba/gba-thread.c
View File

@ -313,6 +313,8 @@ bool GBAThreadStart(struct GBAThread* threadContext) {
MutexInit(&threadContext->sync.audioBufferMutex);
ConditionInit(&threadContext->sync.audioRequiredCond);
threadContext->interruptDepth = 0;
#ifndef _WIN32
sigset_t signals;
sigemptyset(&signals);
@ -426,10 +428,12 @@ void GBAThreadJoin(struct GBAThread* threadContext) {
void GBAThreadInterrupt(struct GBAThread* threadContext) {
MutexLock(&threadContext->stateMutex);
threadContext->savedState = threadContext->state;
if (threadContext->sync.audioWait) {
ConditionWake(&threadContext->sync.audioRequiredCond);
++threadContext->interruptDepth;
if (threadContext->interruptDepth > 1) {
MutexUnlock(&threadContext->stateMutex);
return;
}
threadContext->savedState = threadContext->state;
_waitOnInterrupt(threadContext);
threadContext->state = THREAD_INTERRUPTING;
if (threadContext->debugger && threadContext->debugger->state == DEBUGGER_RUNNING) {
@ -441,7 +445,13 @@ void GBAThreadInterrupt(struct GBAThread* threadContext) {
}
void GBAThreadContinue(struct GBAThread* threadContext) {
_changeState(threadContext, threadContext->savedState, 1);
MutexLock(&threadContext->stateMutex);
--threadContext->interruptDepth;
if (threadContext->interruptDepth < 1) {
threadContext->state = threadContext->savedState;
ConditionWake(&threadContext->stateCond);
}
MutexUnlock(&threadContext->stateMutex);
}
void GBAThreadPause(struct GBAThread* threadContext) {

1
src/gba/gba-thread.h
View File

@ -76,6 +76,7 @@ struct GBAThread {
Mutex stateMutex;
Condition stateCond;
enum ThreadState savedState;
int interruptDepth;
LogHandler logHandler;
int logLevel;