pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] JNIEnv should be local for each thread

Browse source
This commit is contained in:
Alex Zolotarev 2011-07-24 17:36:26 +03:00 • committed by Alex Zolotarev
parent 0b6a8f09d4
commit c936477018
5 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/android_framework.cpp
View file

@ -17,12 +17,15 @@ void AndroidFramework::ViewHandle::invalidateImpl()
void AndroidFramework::CallRepaint()
{
m_env->CallVoidMethod(m_parentView,
jni::GetJavaMethodID(m_env, m_parentView, "requestRender", "()V"));
// Always get current env pointer, it's different for each thread
JNIEnv * env;
m_jvm->AttachCurrentThread(&env, NULL);
LOG(LDEBUG, ("AF::CallRepaint", env));
env->CallVoidMethod(m_parentView, jni::GetJavaMethodID(env, m_parentView, "requestRender", "()V"));
}
AndroidFramework::AndroidFramework()
: m_view(new ViewHandle(this)), m_work(m_view, 0)
AndroidFramework::AndroidFramework(JavaVM * jvm)
: m_jvm(jvm), m_view(new ViewHandle(this)), m_work(m_view, 0)
{
m_work.InitStorage(m_storage);
shared_ptr<RenderPolicy> renderPolicy(new RenderPolicyST(m_view, bind(&Framework<model::FeaturesFetcher>::DrawModel, &m_work, _1, _2, _3, _4)));
@ -31,9 +34,8 @@ AndroidFramework::AndroidFramework()
m_storage.ReInitCountries(false);
}
void AndroidFramework::SetParentView(JNIEnv * env, jobject view)
void AndroidFramework::SetParentView(jobject view)
{
m_env = env;
m_parentView = view;
}
@ -52,9 +54,11 @@ void AndroidFramework::InitRenderer()
LOG(LDEBUG, ("AF::InitRenderer 4"));
m_work.initializeGL(pRC, pRM);
LOG(LDEBUG, ("AF::InitRenderer 5"));
m_work.ShowAll();
LOG(LDEBUG, ("AF::InitRenderer 5"));
LOG(LDEBUG, ("AF::InitRenderer 6"));
}
void AndroidFramework::Resize(int w, int h)

6
android/jni/android_framework.hpp
View file

@ -25,17 +25,17 @@ private:
Framework<model::FeaturesFetcher> m_work;
storage::Storage m_storage;
JNIEnv * m_env;
JavaVM * m_jvm;
jobject m_parentView;
void CallRepaint();
public:
AndroidFramework();
AndroidFramework(JavaVM * jvm);
storage::Storage & Storage() { return m_storage; }
void SetParentView(JNIEnv * env, jobject view);
void SetParentView(jobject view);
void InitRenderer();

3
android/jni/android_platform.cpp
View file

@ -5,8 +5,7 @@
#include "../../coding/zip_reader.hpp"
void AndroidPlatform::Initialize(JNIEnv * env, jobject activity, jstring apkPath, jstring storagePath)
void AndroidPlatform::Initialize(JNIEnv * env, jstring apkPath, jstring storagePath)
{
m_resourcesDir = jni::ToString(env, apkPath);
m_writableDir = jni::ToString(env, storagePath);

2
android/jni/android_platform.hpp
View file

@ -7,7 +7,7 @@
class AndroidPlatform : public BasePlatformImpl
{
public:
void Initialize(JNIEnv * env, jobject activity, jstring apkPath, jstring storagePath);
void Initialize(JNIEnv * env, jstring apkPath, jstring storagePath);
virtual ModelReader * GetReader(string const & file) const;
/// Overrided to support zip file listing

37
android/jni/main_native.cpp
View file

@ -7,7 +7,8 @@
#include <string.h>
#include <jni.h>
AndroidFramework * g_work = 0;
static AndroidFramework * g_work = 0;
static JavaVM * g_jvm = 0;
extern "C"
{
@ -15,19 +16,33 @@ extern "C"
// MWMActivity
///////////////////////////////////////////////////////////////////////////////////
JNIEXPORT jint JNICALL
JNI_OnLoad(JavaVM * jvm, void * reserved)
{
g_jvm = jvm;
jni::InitSystemLog();
jni::InitAssertLog();
LOG(LDEBUG, ("JNI_OnLoad"));
return JNI_VERSION_1_4;
}
JNIEXPORT void JNICALL
JNI_OnUnload(JavaVM * vm, void * reserved)
{
delete g_work;
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env, jobject thiz, jstring apkPath, jstring storagePath)
{
jni::InitSystemLog();
jni::InitAssertLog();
LOG(LDEBUG, ("Java_com_mapswithme_maps_MWMActivity_nativeInit 1"));
if (!g_work)
{
GetAndroidPlatform().Initialize(env, apkPath, storagePath);
g_work = new AndroidFramework(g_jvm);
}
LOG(LDEBUG, ("MWMActivity::Init 1"));
GetAndroidPlatform().Initialize(env, thiz, apkPath, storagePath);
LOG(LDEBUG, ("MWMActivity::Init 2"));
g_work = new AndroidFramework();
LOG(LDEBUG, ("MWMActivity::Init 3"));
LOG(LDEBUG, ("Java_com_mapswithme_maps_MWMActivity_nativeInit 2"));
}
///////////////////////////////////////////////////////////////////////////////////
@ -38,7 +53,7 @@ JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MainGLView_nativeInit(JNIEnv * env, jobject thiz)
{
ASSERT ( g_work, () );
g_work->SetParentView(env, thiz);
g_work->SetParentView(thiz);
}
JNIEXPORT void JNICALL