commit 515a5bc89282d6f910cae4d5852bb77124a47825
author Elliott Hughes <enh@google.com> Wed Aug 17 11:08:34 2011 -0700
committer Elliott Hughes <enh@google.com> Wed Aug 17 11:08:34 2011 -0700
tree 431eabffeba344b671a19267829991585c16fda6
parent 4dd71f1538a8d788c56c77378a59ce32afa519d7

Add the -Xcheck:jni option.

And make sure the boolean is available in every JNIEnv, so we
don't have to look it up via Runtime and JavaVM every time we
need to use it.

Change-Id: I2d4b5d04ded196e7c7602406d854bb35227d767a

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index b167280c..2476837 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -180,6 +180,13 @@
   scoped_ptr<ParsedOptions> parsed(new ParsedOptions());
   const char* boot_class_path = getenv("BOOTCLASSPATH");
   parsed->boot_image_ = NULL;
+#ifdef NDEBUG
+  // CheckJNI is off by default for regular builds...
+  parsed->check_jni_ = false;
+#else
+  // ...but on by default in debug builds.
+  parsed->check_jni_ = true;
+#endif
   parsed->heap_initial_size_ = Heap::kInitialSize;
   parsed->heap_maximum_size_ = Heap::kMaximumSize;
   parsed->hook_vfprintf_ = vfprintf;
@@ -194,6 +201,8 @@
       parsed->boot_class_path_ = *reinterpret_cast<const std::vector<DexFile*>*>(options[i].second);
     } else if (option.starts_with("-Xbootimage:")) {
       parsed->boot_image_ = option.substr(strlen("-Xbootimage:")).data();
+    } else if (option.starts_with("-Xcheck:jni")) {
+      parsed->check_jni_ = true;
     } else if (option.starts_with("-Xms")) {
       parsed->heap_initial_size_ = ParseMemoryOption(option.substr(strlen("-Xms")).data(), 1024);
     } else if (option.starts_with("-Xmx")) {
@@ -262,24 +271,24 @@
   Heap::Init(parsed_options->heap_initial_size_,
              parsed_options->heap_maximum_size_);
 
+  java_vm_.reset(reinterpret_cast<JavaVM*>(new JavaVMExt(this, parsed_options->check_jni_)));
+
   Thread::Init();
-  Thread* current_thread = Thread::Attach();
+  Thread* current_thread = Thread::Attach(this);
   thread_list_->Register(current_thread);
 
   class_linker_ = ClassLinker::Create(parsed_options->boot_class_path_);
 
-  java_vm_.reset(reinterpret_cast<JavaVM*>(new JavaVMExt(this)));
-
   return true;
 }
 
 bool Runtime::AttachCurrentThread(const char* name, JNIEnv** penv) {
-  return Thread::Attach() != NULL;
+  return Thread::Attach(instance_) != NULL;
 }
 
 bool Runtime::AttachCurrentThreadAsDaemon(const char* name, JNIEnv** penv) {
   // TODO: do something different for daemon threads.
-  return Thread::Attach() != NULL;
+  return Thread::Attach(instance_) != NULL;
 }
 
 bool Runtime::DetachCurrentThread() {