kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #87 from Hasufel/patch-1

Browse Source 
Multithread was not properly detached
This commit is contained in:
Joshua Granick
2014-02-26 07:58:19 -08:00
parent 1d7ea0f638 fe2e0c56a3
commit cf340c9394
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
project/src/platform/android/AndroidCommon.cpp
View File

@@ -2,13 +2,20 @@
#include <android/log.h>
#include <string>
#include <map>
#include <stdint.h>
#include <stdint.h>
#include <pthread.h>
#undef LOGE
#define LOGE(msg,args...) __android_log_print(ANDROID_LOG_ERROR, "lime::System", msg, ## args)
JavaVM *_vm;
std::map<std::string, jclass> jClassCache;
static pthread_key_t s_thread_key;
static void ThreadDataDestroy (void *env)
{
_vm->DetachCurrentThread();
}
JNIEnv *GetEnv()
{
@@ -19,6 +26,7 @@ JNIEnv *GetEnv()
if (_vm->AttachCurrentThread(&env, 0) != 0) {
LOGE("Failed to attach");
}
pthread_setspecific (s_thread_key, &env);
}
return env;
}
@@ -46,6 +54,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
{
_vm = vm;
jClassCache = std::map<std::string, jclass>();
pthread_key_create(&s_thread_key, ThreadDataDestroy);
return JNI_VERSION_1_4; // the required JNI version
}