diff options
author | Mathieu Chartier <mathieuc@google.com> | 2015-01-14 14:55:47 -0800 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2015-01-15 12:23:28 -0800 |
commit | e34fa1df67fbe0173b4ea9abddcc3ae3d0537037 (patch) | |
tree | a5148f079b5671a95f60910c41981ebf91db3a02 /runtime/object_callbacks.h | |
parent | 9f06b1946ae3ef1d2fd75bbf7f0a288bc611fe58 (diff) | |
download | android_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/object_callbacks.h')
-rw-r--r-- | runtime/object_callbacks.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/runtime/object_callbacks.h b/runtime/object_callbacks.h index 592deed1a7..cf81cc5093 100644 --- a/runtime/object_callbacks.h +++ b/runtime/object_callbacks.h @@ -35,34 +35,10 @@ namespace mirror { } // namespace mirror class StackVisitor; -enum RootType { - kRootUnknown = 0, - kRootJNIGlobal, - kRootJNILocal, - kRootJavaFrame, - kRootNativeStack, - kRootStickyClass, - kRootThreadBlock, - kRootMonitorUsed, - kRootThreadObject, - kRootInternedString, - kRootDebugger, - kRootVMInternal, - kRootJNIMonitor, -}; -std::ostream& operator<<(std::ostream& os, const RootType& root_type); - -// Returns the new address of the object, returns root if it has not moved. tid and root_type are -// only used by hprof. -typedef void (RootCallback)(mirror::Object** root, void* arg, uint32_t thread_id, - RootType root_type); // A callback for visiting an object in the heap. typedef void (ObjectCallback)(mirror::Object* obj, void* arg); // A callback used for marking an object, returns the new address of the object if the object moved. typedef mirror::Object* (MarkObjectCallback)(mirror::Object* obj, void* arg) WARN_UNUSED; -// A callback for verifying roots. -typedef void (VerifyRootCallback)(const mirror::Object* root, void* arg, size_t vreg, - const StackVisitor* visitor, RootType root_type); typedef void (MarkHeapReferenceCallback)(mirror::HeapReference<mirror::Object>* ref, void* arg); typedef void (DelayReferenceReferentCallback)(mirror::Class* klass, mirror::Reference* ref, void* arg); |