Cache jclass and jmethod instances for callbacks on the JniRef struct.

This is safe to cache as none of the instantiated callback interfaces can be changed once a Node object is created.
This commit is contained in:
Grant Limberg 2015-04-24 20:34:36 -07:00
parent 9c62ce9e6f
commit 0d4283a3fa

View file

@ -46,11 +46,27 @@ namespace {
: env(NULL) : env(NULL)
, node(NULL) , node(NULL)
, dataStoreGetListener(NULL) , dataStoreGetListener(NULL)
, dataStoreGetClass(NULL)
, dataStoreGetCallbackMethod(NULL)
, dataStorePutListener(NULL) , dataStorePutListener(NULL)
, dataStorePutClass(NULL)
, dataStorePutCallbackMethod(NULL)
, deleteMethod(NULL)
, packetSender(NULL) , packetSender(NULL)
, packetSenderClass(NULL)
, packetSenderCallbackMethod(NULL)
, eventListener(NULL) , eventListener(NULL)
, eventListenerClass(NULL)
, onEventMethod(NULL)
, onOutOfDateMethod(NULL)
, onNetworkErrorMethod(NULL)
, onTraceMethod(NULL)
, frameListener(NULL) , frameListener(NULL)
, frameListenerClass(NULL)
, frameListenerCallbackMethod(NULL)
, configListener(NULL) , configListener(NULL)
, configListenerClass(NULL)
, configListenerCallbackMethod(NULL)
{} {}
uint64_t id; uint64_t id;
@ -59,11 +75,32 @@ namespace {
ZT1_Node *node; ZT1_Node *node;
jobject dataStoreGetListener; jobject dataStoreGetListener;
jclass dataStoreGetClass;
jmethodID dataStoreGetCallbackMethod;
jobject dataStorePutListener; jobject dataStorePutListener;
jclass dataStorePutClass;
jmethodID dataStorePutCallbackMethod;
jmethodID deleteMethod;
jobject packetSender; jobject packetSender;
jclass packetSenderClass;
jmethodID packetSenderCallbackMethod;
jobject eventListener; jobject eventListener;
jclass eventListenerClass;
jmethodID onEventMethod;
jmethodID onOutOfDateMethod;
jmethodID onNetworkErrorMethod;
jmethodID onTraceMethod;
jobject frameListener; jobject frameListener;
jclass frameListenerClass;
jmethodID frameListenerCallbackMethod;
jobject configListener; jobject configListener;
jclass configListenerClass;
jmethodID configListenerCallbackMethod;
}; };
@ -79,22 +116,25 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass configListenerClass = NULL; if(ref->configListenerClass == NULL)
jmethodID callbackMethod = NULL; {
ref->configListenerClass = env->GetObjectClass(ref->configListener);
configListenerClass = env->GetObjectClass(ref->configListener); if(ref->configListenerClass == NULL)
if(configListenerClass == NULL)
{ {
return -1; return -1;
} }
}
callbackMethod = env->GetMethodID(configListenerClass, if(ref->configListenerCallbackMethod == NULL)
{
ref->configListenerCallbackMethod = env->GetMethodID(ref->configListenerClass,
"onNetworkConfigurationUpdated", "onNetworkConfigurationUpdated",
"(JLcom/zerotierone/sdk/VirtualNetworkConfigOperation;Lcom/zerotierone/sdk/VirtualNetworkConfig;)I"); "(JLcom/zerotierone/sdk/VirtualNetworkConfigOperation;Lcom/zerotierone/sdk/VirtualNetworkConfig;)I");
if(callbackMethod == NULL) if(ref->configListenerCallbackMethod == NULL)
{ {
return -2; return -2;
} }
}
jobject operationObject = createVirtualNetworkConfigOperation(env, operation); jobject operationObject = createVirtualNetworkConfigOperation(env, operation);
if(operationObject == NULL) if(operationObject == NULL)
@ -108,7 +148,10 @@ namespace {
return -4; return -4;
} }
return env->CallIntMethod(ref->configListener, callbackMethod, (jlong)nwid, operationObject, networkConfigObject); return env->CallIntMethod(
ref->configListener,
ref->configListenerCallbackMethod,
(jlong)nwid, operationObject, networkConfigObject);
} }
void VirtualNetworkFrameFunctionCallback(ZT1_Node *node,void *userData, void VirtualNetworkFrameFunctionCallback(ZT1_Node *node,void *userData,
@ -125,26 +168,30 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass frameListenerClass = NULL; if(ref->frameListenerClass == NULL)
jmethodID callbackMethod = NULL; {
ref->frameListenerClass = env->GetObjectClass(ref->frameListener);
frameListenerClass = env->GetObjectClass(ref->frameListener); if(ref->frameListenerClass == NULL)
if(frameListenerClass == NULL)
{ {
return; return;
} }
}
callbackMethod = env->GetMethodID(frameListenerClass, if(ref->frameListenerCallbackMethod == NULL)
{
ref->frameListenerCallbackMethod = env->GetMethodID(
ref->frameListenerClass,
"onVirtualNetworkFrame", "(JJJJJ[B)V"); "onVirtualNetworkFrame", "(JJJJJ[B)V");
if(callbackMethod == NULL) if(ref->frameListenerCallbackMethod == NULL)
{ {
return; return;
} }
}
jbyteArray dataArray = env->NewByteArray(frameLength); jbyteArray dataArray = env->NewByteArray(frameLength);
env->SetByteArrayRegion(dataArray, 0, frameLength, (jbyte*)frameData); env->SetByteArrayRegion(dataArray, 0, frameLength, (jbyte*)frameData);
env->CallVoidMethod(ref->frameListener, callbackMethod, nwid, sourceMac, destMac, etherType, vlanid, dataArray); env->CallVoidMethod(ref->frameListener, ref->frameListenerCallbackMethod, nwid, sourceMac, destMac, etherType, vlanid, dataArray);
} }
@ -155,45 +202,54 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass eventListenerClass = NULL; if(ref->eventListenerClass)
jmethodID onEventMethod = NULL; {
jmethodID onOutOfDateMethod = NULL; ref->eventListenerClass = env->GetObjectClass(ref->eventListener);
jmethodID onNetworkErrorMethod = NULL; if(ref->eventListenerClass == NULL)
jmethodID onTraceMethod = NULL;
eventListenerClass = env->GetObjectClass(ref->eventListener);
if(eventListenerClass == NULL)
{ {
return; return;
} }
}
onEventMethod = env->GetMethodID(eventListenerClass, if(ref->onEventMethod == NULL)
{
ref->onEventMethod = env->GetMethodID(ref->eventListenerClass,
"onEvent", "(Lcom/zerotierone/sdk/Event;)V"); "onEvent", "(Lcom/zerotierone/sdk/Event;)V");
if(onEventMethod == NULL) if(ref->onEventMethod == NULL)
{ {
return; return;
} }
}
onOutOfDateMethod = env->GetMethodID(eventListenerClass, if(ref->onOutOfDateMethod == NULL)
{
ref->onOutOfDateMethod = env->GetMethodID(ref->eventListenerClass,
"onOutOfDate", "(Lcom/zerotierone/sdk/Version;)V"); "onOutOfDate", "(Lcom/zerotierone/sdk/Version;)V");
if(onOutOfDateMethod == NULL) if(ref->onOutOfDateMethod == NULL)
{ {
return; return;
} }
}
onNetworkErrorMethod = env->GetMethodID(eventListenerClass, if(ref->onOutOfDateMethod == NULL)
{
ref->onNetworkErrorMethod = env->GetMethodID(ref->eventListenerClass,
"onNetworkError", "(Lcom/zerotierone/sdk/Version;Ljava/net/InetAddress;)V"); "onNetworkError", "(Lcom/zerotierone/sdk/Version;Ljava/net/InetAddress;)V");
if(onNetworkErrorMethod == NULL) if(ref->onNetworkErrorMethod == NULL)
{ {
return; return;
} }
}
onTraceMethod = env->GetMethodID(eventListenerClass, if(ref->onTraceMethod == NULL)
{
ref->onTraceMethod = env->GetMethodID(ref->eventListenerClass,
"onTrace", "(Ljava/lang/String;)V"); "onTrace", "(Ljava/lang/String;)V");
if(onTraceMethod == NULL) if(ref->onTraceMethod == NULL)
{ {
return; return;
} }
}
jobject eventObject = createEvent(env, event); jobject eventObject = createEvent(env, event);
if(eventObject == NULL) if(eventObject == NULL)
@ -210,7 +266,7 @@ namespace {
case ZT1_EVENT_FATAL_ERROR_IDENTITY_COLLISION: case ZT1_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
{ {
// call onEvent() // call onEvent()
env->CallVoidMethod(eventListenerClass, onEventMethod, eventObject); env->CallVoidMethod(ref->eventListener, ref->onEventMethod, eventObject);
} }
break; break;
case ZT1_EVENT_SAW_MORE_RECENT_VERSION: case ZT1_EVENT_SAW_MORE_RECENT_VERSION:
@ -220,7 +276,7 @@ namespace {
{ {
int *version = (int*)data; int *version = (int*)data;
jobject verisonObj = newVersion(env, version[0], version[1], version[2], 0); jobject verisonObj = newVersion(env, version[0], version[1], version[2], 0);
env->CallVoidMethod(eventListenerClass, onEventMethod, verisonObj); env->CallVoidMethod(ref->eventListener, ref->onOutOfDateMethod, verisonObj);
} }
} }
break; break;
@ -232,7 +288,7 @@ namespace {
{ {
sockaddr_storage *addr = (sockaddr_storage*)data; sockaddr_storage *addr = (sockaddr_storage*)data;
jobject addressObj = newInetAddress(env, *addr); jobject addressObj = newInetAddress(env, *addr);
env->CallVoidMethod(eventListenerClass, onNetworkErrorMethod, addressObj); env->CallVoidMethod(ref->eventListener, ref->onNetworkErrorMethod, addressObj);
} }
} }
case ZT1_EVENT_TRACE: case ZT1_EVENT_TRACE:
@ -242,7 +298,7 @@ namespace {
{ {
const char* message = (const char*)data; const char* message = (const char*)data;
jstring messageStr = env->NewStringUTF(message); jstring messageStr = env->NewStringUTF(message);
env->CallVoidMethod(eventListenerClass, onTraceMethod); env->CallVoidMethod(ref->eventListener, ref->onTraceMethod);
} }
} }
break; break;
@ -261,29 +317,36 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass dataStoreGetClass = NULL;
jmethodID callbackMethod = NULL;
dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
if(dataStoreGetClass == NULL) if(ref->dataStoreGetClass == NULL)
{
ref->dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
if(ref->dataStoreGetClass == NULL)
{ {
return -2; return -2;
} }
}
callbackMethod = env->GetMethodID(dataStoreGetClass, if(ref->dataStoreGetCallbackMethod == NULL)
{
ref->dataStoreGetCallbackMethod = env->GetMethodID(
ref->dataStoreGetClass,
"onDataStoreGet", "onDataStoreGet",
"(Ljava/lang/String;[BJ[J)J"); "(Ljava/lang/String;[BJ[J)J");
if(callbackMethod == NULL) if(ref->dataStoreGetCallbackMethod == NULL)
{ {
return -2; return -2;
} }
}
jstring nameStr = env->NewStringUTF(objectName); jstring nameStr = env->NewStringUTF(objectName);
jbyteArray bufferObj = env->NewByteArray(bufferSize); jbyteArray bufferObj = env->NewByteArray(bufferSize);
jlongArray objectSizeObj = env->NewLongArray(1); jlongArray objectSizeObj = env->NewLongArray(1);
long retval = env->CallLongMethod( long retval = env->CallLongMethod(
dataStoreGetClass, callbackMethod, nameStr, bufferObj, bufferIndex, objectSizeObj); ref->dataStoreGetClass, ref->dataStoreGetCallbackMethod,
nameStr, bufferObj, bufferIndex, objectSizeObj);
env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
env->GetLongArrayRegion(objectSizeObj, 0, 1, (jlong*)&out_objectSize); env->GetLongArrayRegion(objectSizeObj, 0, 1, (jlong*)&out_objectSize);
@ -304,38 +367,44 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass dataStorePutClass = NULL; if(ref->dataStorePutClass == NULL)
jmethodID callbackMethod = NULL; {
jmethodID deleteMethod = NULL; ref->dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener);
if(ref->dataStorePutClass == NULL)
dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener);
if(dataStorePutClass == NULL)
{ {
return -1; return -1;
} }
}
callbackMethod = env->GetMethodID(dataStorePutClass, if(ref->dataStorePutCallbackMethod == NULL)
{
ref->dataStorePutCallbackMethod = env->GetMethodID(
ref->dataStorePutClass,
"onDataStorePut", "onDataStorePut",
"(Ljava/lang/String;[BZ)I"); "(Ljava/lang/String;[BZ)I");
if(callbackMethod == NULL) if(ref->dataStorePutCallbackMethod == NULL)
{ {
return -2; return -2;
} }
}
deleteMethod = env->GetMethodID(dataStorePutClass, if(ref->deleteMethod == NULL)
{
ref->deleteMethod = env->GetMethodID(ref->dataStorePutClass,
"onDelete", "(Ljava/lang/String;)I"); "onDelete", "(Ljava/lang/String;)I");
if(deleteMethod == NULL) if(ref->deleteMethod == NULL)
{ {
return -3; return -3;
} }
}
jstring nameStr = env->NewStringUTF(objectName); jstring nameStr = env->NewStringUTF(objectName);
if(buffer == NULL) if(buffer == NULL)
{ {
// delete operation // delete operation
return env->CallIntMethod(dataStorePutClass, deleteMethod, nameStr); return env->CallIntMethod(
ref->dataStorePutListener, ref->deleteMethod, nameStr);
} }
else else
{ {
@ -345,7 +414,8 @@ namespace {
bool secure = secure != 0; bool secure = secure != 0;
return env->CallIntMethod(dataStorePutClass, callbackMethod, return env->CallIntMethod(ref->dataStorePutListener,
ref->dataStorePutCallbackMethod,
nameStr, bufferObj, secure); nameStr, bufferObj, secure);
} }
} }
@ -361,25 +431,29 @@ namespace {
JNIEnv *env = ref->env; JNIEnv *env = ref->env;
jclass packetSenderClass = NULL; if(ref->packetSenderClass == NULL)
jmethodID callbackMethod = NULL; {
ref->packetSenderClass = env->GetObjectClass(ref->packetSender);
packetSenderClass = env->GetObjectClass(ref->packetSender); if(ref->packetSenderClass == NULL)
if(packetSenderClass == NULL)
{ {
return -1; return -1;
} }
}
callbackMethod = env->GetMethodID(packetSenderClass, if(ref->packetSenderCallbackMethod == NULL)
{
ref->packetSenderCallbackMethod = env->GetMethodID(ref->packetSenderClass,
"onSendPacketRequested", "(Ljava/lang/String;I[B)I"); "onSendPacketRequested", "(Ljava/lang/String;I[B)I");
if(callbackMethod == NULL) if(ref->packetSenderCallbackMethod == NULL)
{ {
return -2; return -2;
} }
}
jobject addressObj = newInetAddress(env, *address); jobject addressObj = newInetAddress(env, *address);
jbyteArray bufferObj = env->NewByteArray(bufferSize); jbyteArray bufferObj = env->NewByteArray(bufferSize);
env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
return env->CallIntMethod(packetSenderClass, callbackMethod, addressObj, linkDesparation, bufferObj); return env->CallIntMethod(ref->packetSender, ref->packetSenderCallbackMethod, addressObj, linkDesparation, bufferObj);
} }
typedef std::map<uint64_t, JniRef*> NodeMap; typedef std::map<uint64_t, JniRef*> NodeMap;