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/indirect_reference_table.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'runtime/indirect_reference_table.h') diff --git a/runtime/indirect_reference_table.h b/runtime/indirect_reference_table.h index fbd5714688..7f7870a412 100644 --- a/runtime/indirect_reference_table.h +++ b/runtime/indirect_reference_table.h @@ -31,6 +31,8 @@ namespace art { +class RootInfo; + namespace mirror { class Object; } // namespace mirror @@ -316,7 +318,7 @@ class IndirectReferenceTable { return IrtIterator(table_, Capacity(), Capacity()); } - void VisitRoots(RootCallback* callback, void* arg, uint32_t tid, RootType root_type) + void VisitRoots(RootCallback* callback, void* arg, const RootInfo& root_info) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); uint32_t GetSegmentState() const { -- cgit v1.2.3-59-g8ed1b