removed DeleteLocals in favor of stack frames

joeferner · joeferner · commit b5468098cb29 · 2012-10-29T14:12:32.000-04:00
diff --git a/src/java.cpp b/src/java.cpp
@@ -535,10 +535,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     POP_LOCAL_JAVA_FRAME_AND_RETURN(ThrowException(javaExceptionToV8(env, errStr.str())));
   }
 
-  env->DeleteLocalRef(clazz);
-  env->DeleteLocalRef(field);
-  env->DeleteLocalRef(fieldClazz);
-
   POP_LOCAL_JAVA_FRAME_AND_RETURN(scope.Close(javaToV8(self, env, val)));
 }
 
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -43,9 +43,6 @@
     v8::Handle<v8::String> methodNameSync = v8::String::New((methodNameStr + "Sync").c_str());
     v8::Local<v8::FunctionTemplate> methodCallSyncTemplate = v8::FunctionTemplate::New(methodCallSync, methodName);
     javaObjectObj->Set(methodNameSync, methodCallSyncTemplate->GetFunction());
-
-    env->DeleteLocalRef(methodNameJava);
-    env->DeleteLocalRef(*it);
   }
 
   std::list<jobject> fields;
@@ -58,13 +55,8 @@
 
     v8::Handle<v8::String> fieldName = v8::String::New(fieldNameStr.c_str());
     javaObjectObj->SetAccessor(fieldName, fieldGetter, fieldSetter);
-
-    env->DeleteLocalRef(fieldNameJava);
-    env->DeleteLocalRef(*it);
   }
 
-  env->DeleteLocalRef(obj);
-
   POP_LOCAL_JAVA_FRAME();
 
   return scope.Close(javaObjectObj);
@@ -127,8 +119,6 @@ JavaObject::~JavaObject() {
   InstanceMethodCallBaton* baton = new InstanceMethodCallBaton(self->m_java, self, method, methodArgs, callback);
   baton->run();
 
-  env->DeleteLocalRef(methodArgs);
-  env->DeleteLocalRef(method);
   POP_LOCAL_JAVA_FRAME();
 
   END_CALLBACK_FUNCTION("\"Method '" << methodNameStr << "' called without a callback did you mean to use the Sync version?\"");
@@ -202,9 +192,6 @@ JavaObject::~JavaObject() {
 
   v8::Handle<v8::Value> result = javaToV8(self->m_java, env, val);
 
-  env->DeleteLocalRef(fieldClazz);
-  env->DeleteLocalRef(field);
-  env->DeleteLocalRef(val);
   POP_LOCAL_JAVA_FRAME();
 
   return scope.Close(result);
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -123,6 +123,8 @@ void StaticMethodCallBaton::execute(JNIEnv *env) {
 }
 
 void InstanceMethodCallBaton::execute(JNIEnv *env) {
+  PUSH_LOCAL_JAVA_FRAME();
+
   jclass methodClazz = env->FindClass("java/lang/reflect/Method");
   jmethodID method_invoke = env->GetMethodID(methodClazz, "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;");
 
@@ -136,18 +138,17 @@ void InstanceMethodCallBaton::execute(JNIEnv *env) {
 
   jobject result = env->CallObjectMethod(m_method, method_invoke, m_javaObject->getObject(), m_args);
 
-  env->DeleteLocalRef(methodClazz);
-
   jthrowable err = env->ExceptionOccurred();
   if(err) {
     m_error = (jthrowable)env->NewGlobalRef(err);
     m_errorString = "Error running instance method";
     env->ExceptionClear();
+    POP_LOCAL_JAVA_FRAME();
     return;
   }
 
   m_result = env->NewGlobalRef(result);
-  env->DeleteLocalRef(result);
+  POP_LOCAL_JAVA_FRAME();
 }
 
 NewInstanceBaton::NewInstanceBaton(
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -20,12 +20,10 @@ void javaReflectionGetMethods(JNIEnv *env, jclass clazz, std::list<jobject>* met
     jobject method = env->GetObjectArrayElement(methodObjects, i);
     jint methodModifiers = env->CallIntMethod(method, method_getModifiers);
     if((methodModifiers & MODIFIER_STATIC) == MODIFIER_STATIC) {
-      env->DeleteLocalRef(method);
       continue;
     }
     methods->push_back(method);
   }
-  env->DeleteLocalRef(methodObjects);
 }
 
 void javaReflectionGetFields(JNIEnv *env, jclass clazz, std::list<jobject>* fields) {
@@ -40,12 +38,10 @@ void javaReflectionGetFields(JNIEnv *env, jclass clazz, std::list<jobject>* fiel
     jobject field = env->GetObjectArrayElement(fieldObjects, i);
     jint fieldModifiers = env->CallIntMethod(field, field_getModifiers);
     if((fieldModifiers & MODIFIER_STATIC) == MODIFIER_STATIC) {
-      env->DeleteLocalRef(field);
       continue;
     }
     fields->push_back(field);
   }
-  env->DeleteLocalRef(fieldObjects);
 }
 
 std::string javaToString(JNIEnv *env, jstring str) {
@@ -171,17 +167,12 @@ jobject javaFindField(JNIEnv* env, jclass clazz, std::string& fieldName) {
     jobject field = env->GetObjectArrayElement(fieldObjects, i);
     jstring fieldNameJava = (jstring)env->CallObjectMethod(field, field_getName);
     std::string itFieldName = javaToString(env, fieldNameJava);
-    env->DeleteLocalRef(fieldNameJava);
     if(strcmp(itFieldName.c_str(), fieldName.c_str()) == 0) {
       result = field;
       break;
     }
-    env->DeleteLocalRef(field);
   }
 
-  env->DeleteLocalRef(fieldObjects);
-  env->DeleteLocalRef(clazzclazz);
-  env->DeleteLocalRef(fieldClazz);
   return result;
 }
 
@@ -295,9 +286,7 @@ jobjectArray v8ToJava(JNIEnv* env, const v8::Arguments& args, int start, int end
   for(int i=start; i<end; i++) {
     jobject val = v8ToJava(env, args[i]);
     env->SetObjectArrayElement(results, i - start, val);
-    env->DeleteLocalRef(val);
   }
-  env->DeleteLocalRef(clazz);
 
   return results;
 }
@@ -436,6 +425,8 @@ v8::Handle<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj) {
 }
 
 jobjectArray javaObjectArrayToClasses(JNIEnv *env, jobjectArray objs) {
+  PUSH_LOCAL_JAVA_FRAME();
+
   jclass clazzClazz = env->FindClass("java/lang/Class");
   jsize objsLength = env->GetArrayLength(objs);
   jobjectArray results = env->NewObjectArray(objsLength, clazzClazz, NULL);
@@ -446,27 +437,23 @@ jobjectArray javaObjectArrayToClasses(JNIEnv *env, jobjectArray objs) {
     } else {
       jclass objClazz = env->GetObjectClass(elem);
       env->SetObjectArrayElement(results, i, objClazz);
-      env->DeleteLocalRef(objClazz);
     }
-    env->DeleteLocalRef(elem);
   }
-  env->DeleteLocalRef(clazzClazz);
-  return results;
+
+  POP_LOCAL_JAVA_FRAME_AND_RETURN_JAVA(results);
 }
 
 jobject javaFindMethod(JNIEnv *env, jclass clazz, std::string& methodName, jobjectArray methodArgs) {
+  PUSH_LOCAL_JAVA_FRAME();
+
   jclass methodUtilsClazz = env->FindClass("com/nearinfinity/org/apache/commons/lang3/reflect/MethodUtils");
   jmethodID methodUtils_getMatchingAccessibleMethod = env->GetStaticMethodID(methodUtilsClazz, "getMatchingAccessibleMethod", "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;");
   const char *methodNameCStr = methodName.c_str();
   jstring methodNameJavaStr = env->NewStringUTF(methodNameCStr);
   jobjectArray methodArgClasses = javaObjectArrayToClasses(env, methodArgs);
   jobject method = env->CallStaticObjectMethod(methodUtilsClazz, methodUtils_getMatchingAccessibleMethod, clazz, methodNameJavaStr, methodArgClasses);
 
-  env->DeleteLocalRef(methodUtilsClazz);
-  env->DeleteLocalRef(methodNameJavaStr);
-  env->DeleteLocalRef(methodArgClasses);
-
-  return method;
+  POP_LOCAL_JAVA_FRAME_AND_RETURN_JAVA(method);
 }
 
 jobject javaFindConstructor(JNIEnv *env, jclass clazz, jobjectArray methodArgs) {
diff --git a/src/utils.h b/src/utils.h
@@ -131,4 +131,8 @@ jobject javaFindConstructor(JNIEnv *env, jclass clazz, jobjectArray methodArgs);
   env->PopLocalFrame(NULL); \
   return r;
 
+#define POP_LOCAL_JAVA_FRAME_AND_RETURN_JAVA(r) \
+  env->PopLocalFrame(r); \
+  return r;
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -535,10 +535,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM jvm, JNIEnv env) {`
`535`	`535`	`POP_LOCAL_JAVA_FRAME_AND_RETURN(ThrowException(javaExceptionToV8(env, errStr.str())));`
`536`	`536`	`}`
`537`	`537`
`538`		`- env->DeleteLocalRef(clazz);`
`539`		`- env->DeleteLocalRef(field);`
`540`		`- env->DeleteLocalRef(fieldClazz);`
`541`		`-`
`542`	`538`	`POP_LOCAL_JAVA_FRAME_AND_RETURN(scope.Close(javaToV8(self, env, val)));`
`543`	`539`	`}`
`544`	`540`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,10 @@ void javaReflectionGetMethods(JNIEnv env, jclass clazz, std::list<jobject> met`
`20`	`20`	`jobject method = env->GetObjectArrayElement(methodObjects, i);`
`21`	`21`	`jint methodModifiers = env->CallIntMethod(method, method_getModifiers);`
`22`	`22`	`if((methodModifiers & MODIFIER_STATIC) == MODIFIER_STATIC) {`
`23`		`- env->DeleteLocalRef(method);`
`24`	`23`	`continue;`
`25`	`24`	`}`
`26`	`25`	`methods->push_back(method);`
`27`	`26`	`}`
`28`		`- env->DeleteLocalRef(methodObjects);`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`void javaReflectionGetFields(JNIEnv env, jclass clazz, std::list<jobject> fields) {`
`@@ -40,12 +38,10 @@ void javaReflectionGetFields(JNIEnv env, jclass clazz, std::list<jobject> fiel`
`40`	`38`	`jobject field = env->GetObjectArrayElement(fieldObjects, i);`
`41`	`39`	`jint fieldModifiers = env->CallIntMethod(field, field_getModifiers);`
`42`	`40`	`if((fieldModifiers & MODIFIER_STATIC) == MODIFIER_STATIC) {`
`43`		`- env->DeleteLocalRef(field);`
`44`	`41`	`continue;`
`45`	`42`	`}`
`46`	`43`	`fields->push_back(field);`
`47`	`44`	`}`
`48`		`- env->DeleteLocalRef(fieldObjects);`
`49`	`45`	`}`
`50`	`46`
`51`	`47`	`std::string javaToString(JNIEnv *env, jstring str) {`
`@@ -171,17 +167,12 @@ jobject javaFindField(JNIEnv* env, jclass clazz, std::string& fieldName) {`
`171`	`167`	`jobject field = env->GetObjectArrayElement(fieldObjects, i);`
`172`	`168`	`jstring fieldNameJava = (jstring)env->CallObjectMethod(field, field_getName);`
`173`	`169`	`std::string itFieldName = javaToString(env, fieldNameJava);`
`174`		`- env->DeleteLocalRef(fieldNameJava);`
`175`	`170`	`if(strcmp(itFieldName.c_str(), fieldName.c_str()) == 0) {`
`176`	`171`	`result = field;`
`177`	`172`	`break;`
`178`	`173`	`}`
`179`		`- env->DeleteLocalRef(field);`
`180`	`174`	`}`
`181`	`175`
`182`		`- env->DeleteLocalRef(fieldObjects);`
`183`		`- env->DeleteLocalRef(clazzclazz);`
`184`		`- env->DeleteLocalRef(fieldClazz);`
`185`	`176`	`return result;`
`186`	`177`	`}`
`187`	`178`
`@@ -295,9 +286,7 @@ jobjectArray v8ToJava(JNIEnv* env, const v8::Arguments& args, int start, int end`
`295`	`286`	`for(int i=start; i<end; i++) {`
`296`	`287`	`jobject val = v8ToJava(env, args[i]);`
`297`	`288`	`env->SetObjectArrayElement(results, i - start, val);`
`298`		`- env->DeleteLocalRef(val);`
`299`	`289`	`}`
`300`		`- env->DeleteLocalRef(clazz);`
`301`	`290`
`302`	`291`	`return results;`
`303`	`292`	`}`
`@@ -436,6 +425,8 @@ v8::Handle<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj) {`
`436`	`425`	`}`
`437`	`426`
`438`	`427`	`jobjectArray javaObjectArrayToClasses(JNIEnv *env, jobjectArray objs) {`
	`428`	`+ PUSH_LOCAL_JAVA_FRAME();`
	`429`	`+`
`439`	`430`	`jclass clazzClazz = env->FindClass("java/lang/Class");`
`440`	`431`	`jsize objsLength = env->GetArrayLength(objs);`
`441`	`432`	`jobjectArray results = env->NewObjectArray(objsLength, clazzClazz, NULL);`
`@@ -446,27 +437,23 @@ jobjectArray javaObjectArrayToClasses(JNIEnv *env, jobjectArray objs) {`
`446`	`437`	`} else {`
`447`	`438`	`jclass objClazz = env->GetObjectClass(elem);`
`448`	`439`	`env->SetObjectArrayElement(results, i, objClazz);`
`449`		`- env->DeleteLocalRef(objClazz);`
`450`	`440`	`}`
`451`		`- env->DeleteLocalRef(elem);`
`452`	`441`	`}`
`453`		`- env->DeleteLocalRef(clazzClazz);`
`454`		`- return results;`
	`442`	`+`
	`443`	`+ POP_LOCAL_JAVA_FRAME_AND_RETURN_JAVA(results);`
`455`	`444`	`}`
`456`	`445`
`457`	`446`	`jobject javaFindMethod(JNIEnv *env, jclass clazz, std::string& methodName, jobjectArray methodArgs) {`
	`447`	`+ PUSH_LOCAL_JAVA_FRAME();`
	`448`	`+`
`458`	`449`	`jclass methodUtilsClazz = env->FindClass("com/nearinfinity/org/apache/commons/lang3/reflect/MethodUtils");`
`459`	`450`	`jmethodID methodUtils_getMatchingAccessibleMethod = env->GetStaticMethodID(methodUtilsClazz, "getMatchingAccessibleMethod", "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;");`
`460`	`451`	`const char *methodNameCStr = methodName.c_str();`
`461`	`452`	`jstring methodNameJavaStr = env->NewStringUTF(methodNameCStr);`
`462`	`453`	`jobjectArray methodArgClasses = javaObjectArrayToClasses(env, methodArgs);`
`463`	`454`	`jobject method = env->CallStaticObjectMethod(methodUtilsClazz, methodUtils_getMatchingAccessibleMethod, clazz, methodNameJavaStr, methodArgClasses);`
`464`	`455`
`465`		`- env->DeleteLocalRef(methodUtilsClazz);`
`466`		`- env->DeleteLocalRef(methodNameJavaStr);`
`467`		`- env->DeleteLocalRef(methodArgClasses);`
`468`		`-`
`469`		`- return method;`
	`456`	`+ POP_LOCAL_JAVA_FRAME_AND_RETURN_JAVA(method);`
`470`	`457`	`}`
`471`	`458`
`472`	`459`	`jobject javaFindConstructor(JNIEnv *env, jclass clazz, jobjectArray methodArgs) {`