From e34fa1df67fbe0173b4ea9abddcc3ae3d0537037 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 14 Jan 2015 14:55:47 -0800 Subject: 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 --- runtime/reference_table.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'runtime/reference_table.cc') diff --git a/runtime/reference_table.cc b/runtime/reference_table.cc index c917d844ae..e454b20d76 100644 --- a/runtime/reference_table.cc +++ b/runtime/reference_table.cc @@ -232,10 +232,9 @@ void ReferenceTable::Dump(std::ostream& os, Table& entries) { DumpSummaryLine(os, prev, GetElementCount(prev), identical, equiv); } -void ReferenceTable::VisitRoots(RootCallback* visitor, void* arg, uint32_t tid, - RootType root_type) { +void ReferenceTable::VisitRoots(RootCallback* visitor, void* arg, const RootInfo& root_info) { for (GcRoot& root : entries_) { - root.VisitRoot(visitor, arg, tid, root_type); + root.VisitRoot(visitor, arg, root_info); } } -- cgit v1.2.3-59-g8ed1b