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

GBA Thread: Add a crashed state to the thread

This commit is contained in:
Jeffrey Pfau 2015-01-08 20:04:44 -08:00
parent 4d0f855923
commit f05a385d6a
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) {
}
}
while (threadContext->state != THREAD_SHUTDOWN) {
while (threadContext->state < THREAD_SHUTDOWN) {
_changeState(threadContext, THREAD_SHUTDOWN, false);
}
@ -356,6 +356,22 @@ bool GBAThreadHasStarted(struct GBAThread* threadContext) {
return hasStarted;
}
bool GBAThreadHasExited(struct GBAThread* threadContext) {
bool hasExited;
MutexLock(&threadContext->stateMutex);
hasExited = threadContext->state > THREAD_EXITING;
MutexUnlock(&threadContext->stateMutex);
return hasExited;
}
bool GBAThreadHasCrashed(struct GBAThread* threadContext) {
bool hasExited;
MutexLock(&threadContext->stateMutex);
hasExited = threadContext->state == THREAD_CRASHED;
MutexUnlock(&threadContext->stateMutex);
return hasExited;
}
void GBAThreadEnd(struct GBAThread* threadContext) {
MutexLock(&threadContext->stateMutex);
if (threadContext->debugger && threadContext->debugger->state == DEBUGGER_RUNNING) {

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

@ -28,7 +28,8 @@ enum ThreadState {
THREAD_PAUSING,
THREAD_RESETING,
THREAD_EXITING,
THREAD_SHUTDOWN
THREAD_SHUTDOWN,
THREAD_CRASHED
};
struct GBASync {
@ -107,6 +108,8 @@ void GBAMapArgumentsToContext(const struct GBAArguments*, struct GBAThread*);
bool GBAThreadStart(struct GBAThread* threadContext);
bool GBAThreadHasStarted(struct GBAThread* threadContext);
bool GBAThreadHasExited(struct GBAThread* threadContext);
bool GBAThreadHasCrashed(struct GBAThread* threadContext);
void GBAThreadEnd(struct GBAThread* threadContext);
void GBAThreadReset(struct GBAThread* threadContext);
void GBAThreadJoin(struct GBAThread* threadContext);

16
src/gba/gba.c
View File

@ -619,15 +619,23 @@ static void _GBAVLog(struct GBA* gba, enum GBALogLevel level, const char* format
return;
}
if (threadContext && threadContext->logHandler) {
threadContext->logHandler(threadContext, level, format, args);
return;
gba->cpu->nextEvent = 0;
if (threadContext) {
if (level == GBA_LOG_FATAL) {
MutexLock(&threadContext->stateMutex);
threadContext->state = THREAD_CRASHED;
MutexUnlock(&threadContext->stateMutex);
}
if (threadContext->logHandler) {
threadContext->logHandler(threadContext, level, format, args);
return;
}
}
vprintf(format, args);
printf("\n");
if (level == GBA_LOG_FATAL) {
if (level == GBA_LOG_FATAL && !threadContext) {
abort();
}
}

3
src/platform/qt/GameController.cpp
View File

@ -109,9 +109,6 @@ GameController::GameController(QObject* parent)
m_threadContext.logHandler = [] (GBAThread* context, enum GBALogLevel level, const char* format, va_list args) {
GameController* controller = static_cast<GameController*>(context->userData);
if (level == GBA_LOG_FATAL) {
MutexLock(&controller->m_threadContext.stateMutex);
controller->m_threadContext.state = THREAD_EXITING;
MutexUnlock(&controller->m_threadContext.stateMutex);
QMetaObject::invokeMethod(controller, "crashGame", Q_ARG(const QString&, QString().vsprintf(format, args)));
} else if (!(controller->m_logLevels & level)) {
return;