encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: use pthread_once for creating thread key 'mThreadKey'

This commit is contained in:
Sylvain Becker 2019-01-11 15:27:53 +01:00
parent 9a98e5afe1
commit 9d82f4e985
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/android/SDL_android.c
View File

@ -225,7 +225,8 @@ static void checkJNIReady(void);
Globals Globals
*******************************************************************************/ *******************************************************************************/
static pthread_key_t mThreadKey; static pthread_key_t mThreadKey;
static JavaVM *mJavaVM; static pthread_once_t key_once = PTHREAD_ONCE_INIT;
static JavaVM *mJavaVM = NULL;
/* Main activity */ /* Main activity */
static jclass mActivityClass; static jclass mActivityClass;
@ -299,6 +300,24 @@ static void Android_JNI_SetEnv(JNIEnv *env);
Functions called by JNI Functions called by JNI
*******************************************************************************/ *******************************************************************************/
static void
Android_JNI_CreateKey()
{
int status = pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed);
if (status < 0) {
__android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing mThreadKey with pthread_key_create() (err=%d)", status);
}
}
static void
Android_JNI_CreateKey_once()
{
int status = pthread_once(&key_once, Android_JNI_CreateKey);
if (status < 0) {
__android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing mThreadKey with pthread_once() (err=%d)", status);
}
}
/* Library init */ /* Library init */
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
{ {
@ -313,9 +332,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
* Create mThreadKey so we can keep track of the JNIEnv assigned to each thread * Create mThreadKey so we can keep track of the JNIEnv assigned to each thread
* Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this * Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this
*/ */
if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed) != 0) { Android_JNI_CreateKey_once();
__android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing pthread key");
}
Android_JNI_SetupThread(); Android_JNI_SetupThread();
return JNI_VERSION_1_4; return JNI_VERSION_1_4;
@ -344,7 +362,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *mEnv, jclass c
} }
if (Android_ActivityMutex == NULL) { if (Android_ActivityMutex == NULL) {
__android_log_print(ANDROID_LOG_VERBOSE, "SDL", "failed to create Android_ActivityMutex mutex"); __android_log_print(ANDROID_LOG_ERROR, "SDL", "failed to create Android_ActivityMutex mutex");
} }
Android_JNI_SetupThread(); Android_JNI_SetupThread();