summaryrefslogtreecommitdiffstats
path: root/runtime/base
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-06-22 22:53:45 -0700
committerAndreas Gampe <agampe@google.com>2015-06-26 10:08:39 -0700
commitb91205e40fe692061edde19ecb87d51414a7fcee (patch)
tree450c5adcfd3d9f8ab4eafb75859c765d15ab8948 /runtime/base
parent1ff04abecc7318826248c24850c1116df5b68b33 (diff)
downloadart-b91205e40fe692061edde19ecb87d51414a7fcee.tar.gz
art-b91205e40fe692061edde19ecb87d51414a7fcee.tar.bz2
art-b91205e40fe692061edde19ecb87d51414a7fcee.zip
ART: Fix streaming tracing issues
Fix a lock ordering issue in streaming-mode tracing. Fix a moving-GC issue in streaming-mode tracing. DexCache objects are not good keys for a map. Expose streaming mode for testing in run-tests. Bug: 21760614 Change-Id: Idcd0575684ee3cc0cec3f81b4fdd0d5988c11e8c
Diffstat (limited to 'runtime/base')
-rw-r--r--runtime/base/mutex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index aa91ca161d..678d55bddd 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -80,6 +80,8 @@ enum LockLevel {
kMarkSweepMarkStackLock,
kInternTableLock,
kOatFileSecondaryLookupLock,
+ kTracingUniqueMethodsLock,
+ kTracingStreamingLock,
kDefaultMutexLevel,
kMarkSweepLargeObjectLock,
kPinTableLock,