summaryrefslogtreecommitdiff
path: root/runtime/debugger.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2017-01-19 09:02:50 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2017-01-19 09:02:50 +0000
commitbf6331a45f730e1f1044af2ce43bceda660ae6fc (patch)
tree66013474dc85b2a868d5fad2506c8674a086fa1a /runtime/debugger.h
parent13093d455b8266338fd713b04261c58e9dc2b164 (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/debugger.h')
-rw-r--r--runtime/debugger.h21
1 files changed, 4 insertions, 17 deletions
diff --git a/runtime/debugger.h b/runtime/debugger.h
index 01359907d9..3b4a5e16b0 100644
--- a/runtime/debugger.h
+++ b/runtime/debugger.h
@@ -502,6 +502,10 @@ class Dbg {
REQUIRES_SHARED(Locks::mutator_lock_);
static void PostException(mirror::Throwable* exception)
REQUIRES_SHARED(Locks::mutator_lock_);
+ static void PostThreadStart(Thread* t)
+ REQUIRES_SHARED(Locks::mutator_lock_);
+ static void PostThreadDeath(Thread* t)
+ REQUIRES_SHARED(Locks::mutator_lock_);
static void PostClassPrepare(mirror::Class* c)
REQUIRES_SHARED(Locks::mutator_lock_);
@@ -703,10 +707,6 @@ class Dbg {
return instrumentation_events_;
}
- static ThreadLifecycleCallback* GetThreadLifecycleCallback() {
- return &thread_lifecycle_callback_;
- }
-
private:
static void ExecuteMethodWithoutPendingException(ScopedObjectAccess& soa, DebugInvokeReq* pReq)
REQUIRES_SHARED(Locks::mutator_lock_);
@@ -725,11 +725,6 @@ class Dbg {
REQUIRES(!Locks::thread_list_lock_) REQUIRES_SHARED(Locks::mutator_lock_);
static void DdmBroadcast(bool connect) REQUIRES_SHARED(Locks::mutator_lock_);
-
- static void PostThreadStart(Thread* t)
- REQUIRES_SHARED(Locks::mutator_lock_);
- static void PostThreadDeath(Thread* t)
- REQUIRES_SHARED(Locks::mutator_lock_);
static void PostThreadStartOrStop(Thread*, uint32_t)
REQUIRES_SHARED(Locks::mutator_lock_);
@@ -794,14 +789,6 @@ class Dbg {
static size_t exception_catch_event_ref_count_ GUARDED_BY(Locks::deoptimization_lock_);
static uint32_t instrumentation_events_ GUARDED_BY(Locks::mutator_lock_);
- class DbgThreadLifecycleCallback : public ThreadLifecycleCallback {
- public:
- void ThreadStart(Thread* self) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_);
- void ThreadDeath(Thread* self) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_);
- };
-
- static DbgThreadLifecycleCallback thread_lifecycle_callback_;
-
DISALLOW_COPY_AND_ASSIGN(Dbg);
};