strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: don't continually attach & detach the TLS JNIEnv.

Browse source 
Change-Id: I76424e3af7b9d7fe4de486e7fa0903bb4f7dc17e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86166
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks 2020-01-03 10:21:10 +00:00
parent 37b5d29fc1
commit 3328b9e317
1 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
android/lib/src/main/cpp/androidapp.cpp
View file

@ -56,7 +56,41 @@ JNI_OnLoad(JavaVM* vm, void*) {
return JNI_VERSION_1_6;
}
static void send2JS(jclass loActivityClz, jobject loActivityObj, const std::vector<char>& buffer)
// Exception safe JVM detach, JNIEnv is TLS for Java - so per-thread.
class JNIThreadContext
{
JNIEnv *_env;
public:
JNIThreadContext()
{
assert(javaVM != nullptr);
jint res = javaVM->GetEnv((void**)&_env, JNI_VERSION_1_6);
if (res == JNI_EDETACHED) {
LOG_DBG("Attach worker thread");
res = javaVM->AttachCurrentThread(&_env, nullptr);
if (JNI_OK != res) {
LOG_DBG("Failed to AttachCurrentThread");
}
}
else if (res == JNI_EVERSION) {
LOG_DBG("GetEnv version not supported");
return;
}
else if (res != JNI_OK) {
LOG_DBG("GetEnv another error " << res);
return;
}
}
~JNIThreadContext()
{
javaVM->DetachCurrentThread();
}
JNIEnv *getEnv() const { return _env; }
};
static void send2JS(const JNIThreadContext &jctx, jclass loActivityClz, jobject loActivityObj, const std::vector<char>& buffer)
{
LOG_DBG("Send to JS: " << LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
@ -114,33 +148,13 @@ static void send2JS(jclass loActivityClz, jobject loActivityObj, const std::vect
LOG_DBG("Sending to JavaScript: " << subjs);
JNIEnv *env;
jint res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
if (res == JNI_EDETACHED) {
LOG_DBG("GetEnv need to attach thread");
res = javaVM->AttachCurrentThread(&env, nullptr);
if (JNI_OK != res) {
LOG_DBG("Failed to AttachCurrentThread");
return;
}
}
else if (res == JNI_EVERSION) {
LOG_DBG("GetEnv version not supported");
return;
}
else if (res != JNI_OK) {
LOG_DBG("GetEnv another error");
return;
}
JNIEnv *env = jctx.getEnv();
jstring jstr = env->NewStringUTF(js.c_str());
jmethodID callFakeWebsocket = env->GetMethodID(loActivityClz, "callFakeWebsocketOnMessage", "(Ljava/lang/String;)V");
env->CallVoidMethod(loActivityObj, callFakeWebsocket, jstr);
if (env->ExceptionCheck())
env->ExceptionDescribe();
javaVM->DetachCurrentThread();
}
/// Close the document.
@ -191,6 +205,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
std::thread([loActivityClz, loActivityObj, currentFakeClientFd]
{
Util::setThreadName("app2js");
JNIThreadContext ctx;
while (true)
{
struct pollfd pollfd[2];
@ -228,7 +243,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
return;
std::vector<char> buf(n);
n = fakeSocketRead(currentFakeClientFd, buf.data(), n);
send2JS(loActivityClz, loActivityObj, buf);
send2JS(ctx, loActivityClz, loActivityObj, buf);
}
}
else