diff options
| author | 2014-10-28 20:30:40 +0000 | |
|---|---|---|
| committer | 2014-10-28 20:30:40 +0000 | |
| commit | 1e3926e286b72f53afc84d2e0932ebb7b35a4038 (patch) | |
| tree | e2696077ae7fff5fc288df561c06a51629ad643d /runtime/debugger.h | |
| parent | adcd83ffb74c6776aab826d6de76fe4aa237db08 (diff) | |
| parent | a6e599a8838b7d8098cba12301422e0fb6296753 (diff) | |
am a6e599a8: Merge "Fix JDWP Virtualmachine.Resume command" into lmp-mr1-dev
* commit 'a6e599a8838b7d8098cba12301422e0fb6296753':
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_, |