diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-13 11:33:37 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-03-13 16:38:25 -0700 |
| commit | 12d625f87bcd6c4059a205bb39007a255f57f382 (patch) | |
| tree | b69f6f80f56977c176e0c441869d2f1de06ede70 /runtime/base | |
| parent | b871a15f1f662c8efe10d41199180bd00b6decd1 (diff) | |
| download | art-12d625f87bcd6c4059a205bb39007a255f57f382.zip art-12d625f87bcd6c4059a205bb39007a255f57f382.tar.gz art-12d625f87bcd6c4059a205bb39007a255f57f382.tar.bz2 | |
Change method verifiers to be thread local roots
Bug: 10921004
Change-Id: I3a1425d76cd380587ba67ef6d5ec1227564e55bf
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/mutex.cc | 5 | ||||
| -rw-r--r-- | runtime/base/mutex.h | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index 2ec2b0c..13dcb8c 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -46,7 +46,6 @@ Mutex* Locks::intern_table_lock_ = nullptr; Mutex* Locks::jni_libraries_lock_ = nullptr; Mutex* Locks::logging_lock_ = nullptr; Mutex* Locks::mem_maps_lock_ = nullptr; -Mutex* Locks::method_verifiers_lock_ = nullptr; Mutex* Locks::modify_ldt_lock_ = nullptr; ReaderWriterMutex* Locks::mutator_lock_ = nullptr; Mutex* Locks::profiler_lock_ = nullptr; @@ -1002,10 +1001,6 @@ void Locks::Init() { classlinker_classes_lock_ = new ReaderWriterMutex("ClassLinker classes lock", current_lock_level); - UPDATE_CURRENT_LOCK_LEVEL(kMethodVerifiersLock); - DCHECK(method_verifiers_lock_ == nullptr); - method_verifiers_lock_ = new Mutex("Method verifiers lock", current_lock_level); - UPDATE_CURRENT_LOCK_LEVEL(kMonitorPoolLock); DCHECK(allocated_monitor_ids_lock_ == nullptr); allocated_monitor_ids_lock_ = new Mutex("allocated monitor ids lock", current_lock_level); diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index f9e1e62..6e7b04f 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -588,11 +588,9 @@ class Locks { // Guards lists of classes within the class linker. static ReaderWriterMutex* classlinker_classes_lock_ ACQUIRED_AFTER(breakpoint_lock_); - static Mutex* method_verifiers_lock_ ACQUIRED_AFTER(classlinker_classes_lock_); - // When declaring any Mutex add DEFAULT_MUTEX_ACQUIRED_AFTER to use annotalysis to check the code // doesn't try to hold a higher level Mutex. - #define DEFAULT_MUTEX_ACQUIRED_AFTER ACQUIRED_AFTER(Locks::method_verifiers_lock_) + #define DEFAULT_MUTEX_ACQUIRED_AFTER ACQUIRED_AFTER(Locks::classlinker_classes_lock_) static Mutex* allocated_monitor_ids_lock_ ACQUIRED_AFTER(classlinker_classes_lock_); |