diff options
| author | 2014-10-24 07:49:38 +0000 | |
|---|---|---|
| committer | 2014-10-24 07:49:38 +0000 | |
| commit | 02567379e7099682345fd59d45a23e17711c9ddd (patch) | |
| tree | afab6024db00d1efb6236fadef9886aefe470973 /runtime/debugger.h | |
| parent | a1e50cab308af9f9a94e8bd370111eeff5634914 (diff) | |
| parent | 253fa555d9424a56c52879449eabe73d5c96cf61 (diff) | |
Merge "Fix JDWP Virtualmachine.Resume command"
Diffstat (limited to 'runtime/debugger.h')
| -rw-r--r-- | runtime/debugger.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/debugger.h b/runtime/debugger.h index cb7adae47a..48e457fc6f 100644 --- a/runtime/debugger.h +++ b/runtime/debugger.h @@ -246,7 +246,9 @@ class Dbg { */ static int64_t LastDebuggerActivity(); - static void UndoDebuggerSuspensions(); + static void UndoDebuggerSuspensions() + LOCKS_EXCLUDED(Locks::thread_list_lock_, + Locks::thread_suspend_count_lock_); /* * Class, Object, Array @@ -459,7 +461,9 @@ class Dbg { static void SuspendVM() LOCKS_EXCLUDED(Locks::thread_list_lock_, Locks::thread_suspend_count_lock_); - static void ResumeVM(); + static void ResumeVM() + LOCKS_EXCLUDED(Locks::thread_list_lock_, + Locks::thread_suspend_count_lock_); static JDWP::JdwpError SuspendThread(JDWP::ObjectId thread_id, bool request_suspension = true) LOCKS_EXCLUDED(Locks::mutator_lock_, Locks::thread_list_lock_, |