commit eac766769e3114a078c188ea26776a81f0edb3cf
author Elliott Hughes <enh@google.com> Thu May 24 21:56:51 2012 -0700
committer Elliott Hughes <enh@google.com> Fri May 25 12:04:43 2012 -0700
tree 4b9b8dfc89725173431817baba4455c013e40577
parent 3f9ace8d90bfc48c8d7bf35af66de8ce8238de7f

DO NOT MERGE Fix all unsafe caching to be like libcore.

This way, if a runtime is restarted within a process, we re-initialize all
the cached data.

Conflicts:

	src/native/java_lang_Runtime.cc -- nativeExit lost an argument in dalvik-dev

(cherry picked from commit 7756d5473fa27ce7e6ac7c31770eef7030431da4)

Change-Id: I6184fc20c2a9ec16c4b053584a4d1c3b64452d0f

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index e033059..226334e 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -43,9 +43,9 @@
 #include "trace.h"
 #include "UniquePtr.h"
 #include "verifier/method_verifier.h"
+#include "well_known_classes.h"
 
-// TODO: this drags in cutil/log.h, which conflicts with our logging.h.
-#include "JniConstants.h"
+#include "JniConstants.h" // Last to avoid LOG redefinition in ics-mr1-plus-art.
 
 namespace art {
 
@@ -516,21 +516,17 @@
   CHECK_EQ(self->GetState(), kNative);
 
   JNIEnv* env = self->GetJniEnv();
-  ScopedLocalRef<jclass> ClassLoader_class(env, env->FindClass("java/lang/ClassLoader"));
-  CHECK(ClassLoader_class.get() != NULL);
-  jmethodID getSystemClassLoader = env->GetStaticMethodID(ClassLoader_class.get(),
+  jmethodID getSystemClassLoader = env->GetStaticMethodID(WellKnownClasses::java_lang_ClassLoader,
                                                           "getSystemClassLoader",
                                                           "()Ljava/lang/ClassLoader;");
   CHECK(getSystemClassLoader != NULL);
-  ScopedLocalRef<jobject> class_loader(env, env->CallStaticObjectMethod(ClassLoader_class.get(),
+  ScopedLocalRef<jobject> class_loader(env, env->CallStaticObjectMethod(WellKnownClasses::java_lang_ClassLoader,
                                                                         getSystemClassLoader));
   CHECK(class_loader.get() != NULL);
 
   Thread::Current()->SetClassLoaderOverride(Decode<ClassLoader*>(env, class_loader.get()));
 
-  ScopedLocalRef<jclass> Thread_class(env, env->FindClass("java/lang/Thread"));
-  CHECK(Thread_class.get() != NULL);
-  jfieldID contextClassLoader = env->GetFieldID(Thread_class.get(),
+  jfieldID contextClassLoader = env->GetFieldID(WellKnownClasses::java_lang_Thread,
                                                 "contextClassLoader",
                                                 "Ljava/lang/ClassLoader;");
   CHECK(contextClassLoader != NULL);
@@ -595,11 +591,7 @@
   CHECK_EQ(self->GetState(), kNative);
 
   JNIEnv* env = self->GetJniEnv();
-  ScopedLocalRef<jclass> c(env, env->FindClass("java/lang/Daemons"));
-  CHECK(c.get() != NULL);
-  jmethodID mid = env->GetStaticMethodID(c.get(), "start", "()V");
-  CHECK(mid != NULL);
-  env->CallStaticVoidMethod(c.get(), mid);
+  env->CallStaticVoidMethod(WellKnownClasses::java_lang_Daemons, WellKnownClasses::java_lang_Daemons_start);
   CHECK(!env->ExceptionCheck());
 
   VLOG(startup) << "Runtime::StartDaemonThreads exiting";
@@ -708,6 +700,7 @@
   // First set up JniConstants, which is used by both the runtime's built-in native
   // methods and libcore.
   JniConstants::init(env);
+  WellKnownClasses::Init(env);
 
   // Then set up the native methods provided by the runtime itself.
   RegisterRuntimeNativeMethods(env);