diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-12-15 14:23:10 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-12-15 15:18:46 -0800 |
| commit | 079101a17575114622f6e1d5be5c9ba643630e9a (patch) | |
| tree | bc9ff009cca8e649f24adb8f7626c95b7930be40 /runtime/well_known_classes.cc | |
| parent | 81d035213b0426ee076cc0d017c895c7833d32e8 (diff) | |
| download | art-079101a17575114622f6e1d5be5c9ba643630e9a.zip art-079101a17575114622f6e1d5be5c9ba643630e9a.tar.gz art-079101a17575114622f6e1d5be5c9ba643630e9a.tar.bz2 | |
Move GC daemon locking logic into heap
Fixes deadlock caused by acquirng the mutator lock while
synchronizing on the daemon thread.
Bug: 18739541
Change-Id: I925b8f0f3b58178da6eff17b9c073f655c39597b
Diffstat (limited to 'runtime/well_known_classes.cc')
| -rw-r--r-- | runtime/well_known_classes.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index 80bed23..e368d2c 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -66,7 +66,6 @@ jmethodID WellKnownClasses::java_lang_Byte_valueOf; jmethodID WellKnownClasses::java_lang_Character_valueOf; jmethodID WellKnownClasses::java_lang_ClassLoader_loadClass; jmethodID WellKnownClasses::java_lang_ClassNotFoundException_init; -jmethodID WellKnownClasses::java_lang_Daemons_requestGC; jmethodID WellKnownClasses::java_lang_Daemons_requestHeapTrim; jmethodID WellKnownClasses::java_lang_Daemons_start; jmethodID WellKnownClasses::java_lang_Daemons_stop; @@ -205,7 +204,6 @@ void WellKnownClasses::Init(JNIEnv* env) { java_lang_ClassNotFoundException_init = CacheMethod(env, java_lang_ClassNotFoundException, false, "<init>", "(Ljava/lang/String;Ljava/lang/Throwable;)V"); java_lang_ClassLoader_loadClass = CacheMethod(env, java_lang_ClassLoader, false, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); - java_lang_Daemons_requestGC = CacheMethod(env, java_lang_Daemons, true, "requestGC", "()V"); java_lang_Daemons_requestHeapTrim = CacheMethod(env, java_lang_Daemons, true, "requestHeapTrim", "()V"); java_lang_Daemons_start = CacheMethod(env, java_lang_Daemons, true, "start", "()V"); java_lang_Daemons_stop = CacheMethod(env, java_lang_Daemons, true, "stop", "()V"); |