summaryrefslogtreecommitdiffstats
path: root/runtime/indirect_reference_table.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/indirect_reference_table.cc
parent9f06b1946ae3ef1d2fd75bbf7f0a288bc611fe58 (diff)
downloadart-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.gz
art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.bz2
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/indirect_reference_table.cc')
-rw-r--r--runtime/indirect_reference_table.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc
index 0d84a1ef98..aa2a6b58f1 100644
--- a/runtime/indirect_reference_table.cc
+++ b/runtime/indirect_reference_table.cc
@@ -242,15 +242,15 @@ void IndirectReferenceTable::Trim() {
madvise(release_start, release_end - release_start, MADV_DONTNEED);
}
-void IndirectReferenceTable::VisitRoots(RootCallback* callback, void* arg, uint32_t tid,
- RootType root_type) {
+void IndirectReferenceTable::VisitRoots(RootCallback* callback, void* arg,
+ const RootInfo& root_info) {
for (auto ref : *this) {
if (*ref == nullptr) {
// Need to skip null entries to make it possible to do the
// non-null check after the call back.
continue;
}
- callback(ref, arg, tid, root_type);
+ callback(ref, arg, root_info);
DCHECK(*ref != nullptr);
}
}