summaryrefslogtreecommitdiffstats
path: root/runtime/base
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2015-04-08 16:42:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-08 16:42:39 +0000
commita2d40be3e64b339c6c39d59655507c597251e506 (patch)
tree011137a2bb46a6bc56e9b47c0e5c9d7978aa8ace /runtime/base
parent9d0ab6f0a2f08c3fa9a59e0b8742cf366d7d0feb (diff)
parent4e5b20863898006ec6c9d120cda167d38dda6e60 (diff)
downloadart-a2d40be3e64b339c6c39d59655507c597251e506.zip
art-a2d40be3e64b339c6c39d59655507c597251e506.tar.gz
art-a2d40be3e64b339c6c39d59655507c597251e506.tar.bz2
Merge "Fix JDWP race at runtime shutdown"
Diffstat (limited to 'runtime/base')
-rw-r--r--runtime/base/mutex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 6e7b04f..af00834 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -97,6 +97,7 @@ enum LockLevel {
kAllocTrackerLock,
kDeoptimizationLock,
kProfilerLock,
+ kJdwpShutdownLock,
kJdwpEventListLock,
kJdwpAttachLock,
kJdwpStartLock,