commit 4ffd31315bc0d00ec278e85feed15985de5ac3dc
author Elliott Hughes <enh@google.com> Mon Oct 24 12:06:42 2011 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 24 12:06:42 2011 -0700
tree 9008b944618f4d422cb050d7d1c5aeb74fb39dd9
parent d81871cbbaa34c649e488f94f61a981db33123e5

Implement the zygote debug options (late-enabling -Xcheck:jni and so on).

Change-Id: I03772e7fb95fce1a19dac13f6c5f870164a4d874

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 02c8513..0ece455 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -2525,13 +2525,13 @@
       vm(vm),
       local_ref_cookie(IRT_FIRST_SEGMENT),
       locals(kLocalsInitial, kLocalsMax, kLocal),
-      check_jni(vm->check_jni),
+      check_jni(false),
       work_around_app_jni_bugs(vm->work_around_app_jni_bugs),
       critical(false),
       monitors("monitors", kMonitorsInitial, kMonitorsMax) {
   functions = unchecked_functions = &gNativeInterface;
-  if (check_jni) {
-    functions = GetCheckJniNativeInterface();
+  if (vm->check_jni) {
+    EnableCheckJni();
   }
   // The JniEnv local reference values must be at a consistent offset or else cross-compilation
   // errors will ensue.
@@ -2542,6 +2542,11 @@
 JNIEnvExt::~JNIEnvExt() {
 }
 
+void JNIEnvExt::EnableCheckJni() {
+  check_jni = true;
+  functions = GetCheckJniNativeInterface();
+}
+
 void JNIEnvExt::DumpReferenceTables() {
   locals.Dump();
   monitors.Dump();
@@ -2660,7 +2665,7 @@
 JavaVMExt::JavaVMExt(Runtime* runtime, Runtime::ParsedOptions* options)
     : runtime(runtime),
       check_jni_abort_hook(NULL),
-      check_jni(options->check_jni_),
+      check_jni(false),
       force_copy(false), // TODO: add a way to enable this
       verbose_jni(options->IsVerbose("jni")),
       log_third_party_jni(options->IsVerbose("third-party-jni")),
@@ -2675,8 +2680,8 @@
       libraries_lock("JNI shared libraries map lock"),
       libraries(new Libraries) {
   functions = unchecked_functions = &gInvokeInterface;
-  if (check_jni) {
-    functions = GetCheckJniInvokeInterface();
+  if (options->check_jni_) {
+    EnableCheckJni();
   }
 }
 
@@ -2684,6 +2689,11 @@
   delete libraries;
 }
 
+void JavaVMExt::EnableCheckJni() {
+  check_jni = true;
+  functions = GetCheckJniInvokeInterface();
+}
+
 void JavaVMExt::DumpReferenceTables() {
   {
     MutexLock mu(globals_lock);