summaryrefslogtreecommitdiffstats
path: root/runtime/stack.h
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/stack.h
parent9f06b1946ae3ef1d2fd75bbf7f0a288bc611fe58 (diff)
downloadart-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.zip
art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.gz
art-e34fa1df67fbe0173b4ea9abddcc3ae3d0537037.tar.bz2
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/stack.h')
-rw-r--r--runtime/stack.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/runtime/stack.h b/runtime/stack.h
index 15007af..233e1c3 100644
--- a/runtime/stack.h
+++ b/runtime/stack.h
@@ -22,6 +22,7 @@
#include "arch/instruction_set.h"
#include "dex_file.h"
+#include "gc_root.h"
#include "mirror/object_reference.h"
#include "throw_location.h"
#include "utils.h"
@@ -314,6 +315,19 @@ class ShadowFrame {
DISALLOW_IMPLICIT_CONSTRUCTORS(ShadowFrame);
};
+class JavaFrameRootInfo : public RootInfo {
+ public:
+ JavaFrameRootInfo(uint32_t thread_id, const StackVisitor* stack_visitor, size_t vreg)
+ : RootInfo(kRootJavaFrame, thread_id), stack_visitor_(stack_visitor), vreg_(vreg) {
+ }
+ virtual void Describe(std::ostream& os) const OVERRIDE
+ SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+
+ private:
+ const StackVisitor* const stack_visitor_;
+ const size_t vreg_;
+};
+
// The managed stack is used to record fragments of managed code stacks. Managed code stacks
// may either be shadow frames or lists of frames using fixed frame sizes. Transition records are
// necessary for transitions between code using different frame layouts and transitions into native