summaryrefslogtreecommitdiffstats
path: root/runtime/java_vm_ext.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-01-14 14:55:47 -0800
committerMathieu Chartier <mathieuc@google.com>2015-01-15 12:23:28 -0800
commite34fa1df67fbe0173b4ea9abddcc3ae3d0537037 (patch)
treea5148f079b5671a95f60910c41981ebf91db3a02 /runtime/java_vm_ext.cc
parent9f06b1946ae3ef1d2fd75bbf7f0a288bc611fe58 (diff)
downloadandroid_art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.gz
android_art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.bz2
android_art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.zip
Print more info in MarkSweep::VerifyRoot
Refactored old root callback to use a new class called RootInfo. RootInfo contains all the relevant info related to the root associated with the callback. The MarkSweep::VerifyRoot function now uses this info to print the StackVisitor's described location if the GC root is of the type kRootJavaFrame. Some other cleanup. Example output: E/art (12167): Tried to mark 0x123 not contained by any spaces E/art (12167): Attempting see if it's a bad root E/art (12167): Found invalid root: 0x123 with type RootJavaFrame E/art (12167): Location=Visiting method 'void java.lang.Runtime.gc()' at dex PC 0xffffffff (native PC 0x0) vreg=0 (cherry picked from commit 12f7423a2bb4bfab76700d84eb6d4338d211983a) Bug: 18588862 Change-Id: Ic5a2781f704e931265ffb3621c2eab4b2e25f60f
Diffstat (limited to 'runtime/java_vm_ext.cc')
-rw-r--r--runtime/java_vm_ext.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc
index 7f677ab5d3..4643d145cc 100644
--- a/runtime/java_vm_ext.cc
+++ b/runtime/java_vm_ext.cc
@@ -764,10 +764,8 @@ void JavaVMExt::TrimGlobals() {
void JavaVMExt::VisitRoots(RootCallback* callback, void* arg) {
Thread* self = Thread::Current();
- {
- ReaderMutexLock mu(self, globals_lock_);
- globals_.VisitRoots(callback, arg, 0, kRootJNIGlobal);
- }
+ ReaderMutexLock mu(self, globals_lock_);
+ globals_.VisitRoots(callback, arg, RootInfo(kRootJNIGlobal));
// The weak_globals table is visited by the GC itself (because it mutates the table).
}