pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix findClass thread issue (ClassNotFound from syncthread)

JNI-44
Hussein Kasem 9 years ago
parent
98818383c2
commit
456ad4e50c
3 changed files with 29 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/jniutils.cc
  2. 8
      src/jniutils.hh
  3. 15
      src/org_pEp_jniadapter_AbstractEngine.cc

36
src/jniutils.cc
View File

@ -11,14 +11,6 @@
#include <time64.h> #include <time64.h>
#endif #endif
#if 0 // Enable if log needed
#include <android/log.h>
#define LOG_TAG "PEPJNIUTILS"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
#else
#define LOGD(...)
#endif
namespace pEp { namespace pEp {
namespace JNIAdapter { namespace JNIAdapter {
jclass findClass(JNIEnv *env, const char *classname) jclass findClass(JNIEnv *env, const char *classname)
@ -316,15 +308,15 @@ namespace pEp {
if (!ts) if (!ts)
return (jobject) NULL; return (jobject) NULL;
LOGD("/* Seconds (0-60) */ FROM :%d", ts->tm_sec); //LOGD("/* Seconds (0-60) */ FROM :%d", ts->tm_sec);
LOGD("/* Minutes (0-59) */ :%d", ts->tm_min); //LOGD("/* Minutes (0-59) */ :%d", ts->tm_min);
LOGD("/* Hours (0-23) */ :%d", ts->tm_hour); //LOGD("/* Hours (0-23) */ :%d", ts->tm_hour);
LOGD("/* Day of the month (1-31) */:%d", ts->tm_mday); //LOGD("/* Day of the month (1-31) */:%d", ts->tm_mday);
LOGD("/* Month (0-11) */ :%d", ts->tm_mon); //LOGD("/* Month (0-11) */ :%d", ts->tm_mon);
LOGD("/* Year - 1900 */ :%d", ts->tm_year); //LOGD("/* Year - 1900 */ :%d", ts->tm_year);
time64_t t = timegm64(ts)*1000; time64_t t = timegm64(ts)*1000;
LOGD( "TimeGM returns : %lld", t); //LOGD( "TimeGM returns : %lld", t);
jclass clazz = findClass(env, "java/util/Date"); jclass clazz = findClass(env, "java/util/Date");
jmethodID constructor = env->GetMethodID(clazz, "<init>", "(J)V"); jmethodID constructor = env->GetMethodID(clazz, "<init>", "(J)V");
assert(constructor); assert(constructor);
@ -343,7 +335,7 @@ namespace pEp {
return NULL; return NULL;
jlong t = callLongMethod(env, date, "getTime"); jlong t = callLongMethod(env, date, "getTime");
LOGD( "Set Time to : %lld", t); //LOGD( "Set Time to : %lld", t);
timestamp *ts = (timestamp*)calloc(1, sizeof(timestamp)); timestamp *ts = (timestamp*)calloc(1, sizeof(timestamp));
assert(ts); assert(ts);
if (ts == NULL) if (ts == NULL)
@ -353,12 +345,12 @@ namespace pEp {
time64_t clock = t/1000; time64_t clock = t/1000;
gmtime64_r(&clock, ts); gmtime64_r(&clock, ts);
LOGD("/* Seconds (0-60) */ TO :%d", ts->tm_sec); //LOGD("/* Seconds (0-60) */ TO :%d", ts->tm_sec);
LOGD("/* Minutes (0-59) */ :%d", ts->tm_min); //LOGD("/* Minutes (0-59) */ :%d", ts->tm_min);
LOGD("/* Hours (0-23) */ :%d", ts->tm_hour); //LOGD("/* Hours (0-23) */ :%d", ts->tm_hour);
LOGD("/* Day of the month (1-31) */:%d", ts->tm_mday); //LOGD("/* Day of the month (1-31) */:%d", ts->tm_mday);
LOGD("/* Month (0-11) */ :%d", ts->tm_mon); //LOGD("/* Month (0-11) */ :%d", ts->tm_mon);
LOGD("/* Year - 1900 */ :%d", ts->tm_year); //LOGD("/* Year - 1900 */ :%d", ts->tm_year);
} }
return ts; return ts;

8
src/jniutils.hh
View File

@ -8,6 +8,14 @@
#include <pEp/identity_list.h> #include <pEp/identity_list.h>
#include <pEp/bloblist.h> #include <pEp/bloblist.h>
#if 1 // Enable if log needed
#include <android/log.h>
#define LOG_TAG "PEPJNIUTILS"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
#else
#define LOGD(...)
#endif
namespace pEp { namespace pEp {
namespace utility { namespace utility {
using namespace std; using namespace std;

15
src/org_pEp_jniadapter_AbstractEngine.cc
View File

@ -221,6 +221,7 @@ extern "C" {
// Called by sync thread only // Called by sync thread only
PEP_STATUS message_to_send(void *obj, message *msg) PEP_STATUS message_to_send(void *obj, message *msg)
{ {
LOGD("Message To Send");
jobject msg_ = NULL; jobject msg_ = NULL;
msg_ = sync_env->NewObject(messageClass, messageConstructorMethodID, (jlong) msg); msg_ = sync_env->NewObject(messageClass, messageConstructorMethodID, (jlong) msg);
@ -266,7 +267,6 @@ extern "C" {
{ {
sync_thread_arg_t *a = (sync_thread_arg_t*)arg; sync_thread_arg_t *a = (sync_thread_arg_t*)arg;
PEP_SESSION session = (PEP_SESSION) a->session; PEP_SESSION session = (PEP_SESSION) a->session;
a->sync_jvm->AttachCurrentThread(&sync_env, NULL); a->sync_jvm->AttachCurrentThread(&sync_env, NULL);
jclass clazz = sync_env->GetObjectClass(sync_obj); jclass clazz = sync_env->GetObjectClass(sync_obj);
@ -274,7 +274,7 @@ extern "C" {
showHandShakeMethodID = sync_env->GetMethodID( showHandShakeMethodID = sync_env->GetMethodID(
clazz, clazz,
"showHandshakeCallFromC", "showHandshakeCallFromC",
"(Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/_Identity;)I"); "(Lorg/pEp/jniadapter/Identity;Lorg/pEp/jniadapter/Identity;)I");
assert(showHandShakeMethodID); assert(showHandShakeMethodID);
messageToSendMethodID = sync_env->GetMethodID( messageToSendMethodID = sync_env->GetMethodID(
@ -285,11 +285,6 @@ extern "C" {
sync_env->DeleteLocalRef(clazz); sync_env->DeleteLocalRef(clazz);
messageClass = findClass(sync_env, "org/pEp/jniadapter/Message");
assert(messageClass);
messageConstructorMethodID = sync_env->GetMethodID(messageClass, "<init>", "(J)V");
assert(messageConstructorMethodID);
PEP_STATUS status = do_sync_protocol(session, a->queue); PEP_STATUS status = do_sync_protocol(session, a->queue);
@ -316,6 +311,7 @@ extern "C" {
jobject obj jobject obj
) )
{ {
LOGD("Start Sync");
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle");
pthread_t *thread = NULL; pthread_t *thread = NULL;
@ -361,7 +357,10 @@ extern "C" {
inject_sync_msg, inject_sync_msg,
retrieve_next_sync_msg); retrieve_next_sync_msg);
messageClass = findClass(env, "org/pEp/jniadapter/Message");
assert(messageClass);
messageConstructorMethodID = env->GetMethodID(messageClass, "<init>", "(J)V");
assert(messageConstructorMethodID);
pthread_create(thread, NULL, sync_thread_routine, (void *) a); pthread_create(thread, NULL, sync_thread_routine, (void *) a);
} }

Write Preview
Loading…
Cancel
Save