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

Ensure thread-local storage is created before it is needed

This commit is contained in:
Jeffrey Pfau 2013-10-25 03:15:31 -07:00
parent d5291eb1b6
commit 07115ca655
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,15 +7,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
static pthread_key_t contextKey; static pthread_key_t _contextKey;
static pthread_once_t _contextOnce = PTHREAD_ONCE_INIT;
static void _createTLS(void) { static void _createTLS(void) {
pthread_key_create(&contextKey, 0); pthread_key_create(&_contextKey, 0);
} }
static void* _GBAThreadRun(void* context) { static void* _GBAThreadRun(void* context) {
static pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&_contextOnce, _createTLS);
pthread_once(&once, _createTLS);
#ifdef USE_DEBUGGER #ifdef USE_DEBUGGER
struct ARMDebugger debugger; struct ARMDebugger debugger;
@ -31,7 +31,7 @@ static void* _GBAThreadRun(void* context) {
GBAInit(&gba); GBAInit(&gba);
threadContext->gba = &gba; threadContext->gba = &gba;
gba.sync = &threadContext->sync; gba.sync = &threadContext->sync;
pthread_setspecific(contextKey, threadContext); pthread_setspecific(_contextKey, threadContext);
if (threadContext->renderer) { if (threadContext->renderer) {
GBAVideoAssociateRenderer(&gba.video, threadContext->renderer); GBAVideoAssociateRenderer(&gba.video, threadContext->renderer);
} }
@ -226,7 +226,8 @@ void GBAThreadTogglePause(struct GBAThread* threadContext) {
} }
struct GBAThread* GBAThreadGetContext(void) { struct GBAThread* GBAThreadGetContext(void) {
return pthread_getspecific(contextKey); pthread_once(&_contextOnce, _createTLS);
return pthread_getspecific(_contextKey);
} }
void GBASyncPostFrame(struct GBASync* sync) { void GBASyncPostFrame(struct GBASync* sync) {