diff options
author | 2017-01-19 09:02:50 +0000 | |
---|---|---|
committer | 2017-01-19 09:02:50 +0000 | |
commit | bf6331a45f730e1f1044af2ce43bceda660ae6fc (patch) | |
tree | 66013474dc85b2a868d5fad2506c8674a086fa1a /runtime/base/mutex.cc | |
parent | 13093d455b8266338fd713b04261c58e9dc2b164 (diff) |
Revert "ART: Start RuntimeCallbacks"
jdwp tests failing with:
STDERR> dalvikvm32 E 01-18 23:14:50 12180 12198 thread-inl.h:137] holding "runtime callbacks lock" at point where thread suspension is expected
Bug: 31684920
This reverts commit 13093d455b8266338fd713b04261c58e9dc2b164.
Change-Id: I94e4154e273d006eecdd485607dcfd96392d6a00
Diffstat (limited to 'runtime/base/mutex.cc')
-rw-r--r-- | runtime/base/mutex.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index edb58c4eb7..9116097604 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -61,7 +61,6 @@ Mutex* Locks::reference_queue_finalizer_references_lock_ = nullptr; Mutex* Locks::reference_queue_phantom_references_lock_ = nullptr; Mutex* Locks::reference_queue_soft_references_lock_ = nullptr; Mutex* Locks::reference_queue_weak_references_lock_ = nullptr; -ReaderWriterMutex* Locks::runtime_callbacks_lock_ = nullptr; Mutex* Locks::runtime_shutdown_lock_ = nullptr; Mutex* Locks::cha_lock_ = nullptr; Mutex* Locks::thread_list_lock_ = nullptr; @@ -968,7 +967,6 @@ void Locks::Init() { DCHECK(trace_lock_ != nullptr); DCHECK(unexpected_signal_lock_ != nullptr); DCHECK(dex_lock_ != nullptr); - DCHECK(runtime_callbacks_lock_ != nullptr); } else { // Create global locks in level order from highest lock level to lowest. LockLevel current_lock_level = kInstrumentEntrypointsLock; @@ -1000,10 +998,6 @@ void Locks::Init() { DCHECK(runtime_shutdown_lock_ == nullptr); runtime_shutdown_lock_ = new Mutex("runtime shutdown lock", current_lock_level); - UPDATE_CURRENT_LOCK_LEVEL(kRuntimeCallbacksLock); - DCHECK(runtime_callbacks_lock_ == nullptr); - runtime_callbacks_lock_ = new ReaderWriterMutex("runtime callbacks lock", current_lock_level); - UPDATE_CURRENT_LOCK_LEVEL(kProfilerLock); DCHECK(profiler_lock_ == nullptr); profiler_lock_ = new Mutex("profiler lock", current_lock_level); |