Merge pull request #4265 from ayeung/timob-13779

TIMOB-13779: Remove access to V8's gc except for profiling.
tidev · May 17, 2013 · df55020 · df55020
2 parents 167c271 + ff244b0
commit df55020
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java b/android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java
@@ -64,8 +64,8 @@ public void initRuntime()
 			DBG = false;
 		}
 
-		nativeInit(useGlobalRefs, deployData.getDebuggerPort(), DBG);
-		
+		nativeInit(useGlobalRefs, deployData.getDebuggerPort(), DBG, deployData.isProfilerEnabled());
+
 		if (deployData.isDebuggerEnabled()) {
 			dispatchDebugMessages();
 		} else if (deployData.isProfilerEnabled()) {
@@ -219,7 +219,7 @@ public void setGCFlag()
 	}
 
 	// JNI method prototypes
-	private native void nativeInit(boolean useGlobalRefs, int debuggerPort, boolean DBG);
+	private native void nativeInit(boolean useGlobalRefs, int debuggerPort, boolean DBG, boolean profilerEnabled);
 	private native void nativeRunModule(String source, String filename, KrollProxySupport activityProxy);
 	private native Object nativeEvalString(String source, String filename);
 	private native void nativeProcessDebugMessages();

diff --git a/android/runtime/v8/src/native/V8Runtime.cpp b/android/runtime/v8/src/native/V8Runtime.cpp
@@ -148,12 +148,14 @@ using namespace titanium;
  * Method:    nativeInit
  * Signature: (Lorg/appcelerator/kroll/runtime/v8/V8Runtime;)J
  */
-JNIEXPORT void JNICALL Java_org_appcelerator_kroll_runtime_v8_V8Runtime_nativeInit(JNIEnv *env, jobject self, jboolean useGlobalRefs, jint debuggerPort, jboolean DBG)
+JNIEXPORT void JNICALL Java_org_appcelerator_kroll_runtime_v8_V8Runtime_nativeInit(JNIEnv *env, jobject self, jboolean useGlobalRefs, jint debuggerPort, jboolean DBG, jboolean profilerEnabled)
 {
-	char* argv[] = { const_cast<char*>(""), const_cast<char*>("--expose-gc") };
-	int argc = sizeof(argv)/sizeof(*argv);
-	V8::SetFlagsFromCommandLine(&argc, argv, false);
-
+	if (profilerEnabled) {
+		char* argv[] = { const_cast<char*>(""), const_cast<char*>("--expose-gc") };
+		int argc = sizeof(argv)/sizeof(*argv);
+		V8::SetFlagsFromCommandLine(&argc, argv, false);
+	}
+
 	HandleScope scope;
 	titanium::JNIScope jniScope(env);