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/thread_list.cc | |
parent | 9f06b1946ae3ef1d2fd75bbf7f0a288bc611fe58 (diff) | |
download | art-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/thread_list.cc')
-rw-r--r-- | runtime/thread_list.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index 0f64883..6ec40d4 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -1045,28 +1045,6 @@ void ThreadList::VisitRoots(RootCallback* callback, void* arg) const { } } -class VerifyRootWrapperArg { - public: - VerifyRootWrapperArg(VerifyRootCallback* callback, void* arg) : callback_(callback), arg_(arg) { - } - VerifyRootCallback* const callback_; - void* const arg_; -}; - -static void VerifyRootWrapperCallback(mirror::Object** root, void* arg, uint32_t /*thread_id*/, - RootType root_type) { - VerifyRootWrapperArg* wrapperArg = reinterpret_cast<VerifyRootWrapperArg*>(arg); - wrapperArg->callback_(*root, wrapperArg->arg_, 0, NULL, root_type); -} - -void ThreadList::VerifyRoots(VerifyRootCallback* callback, void* arg) const { - VerifyRootWrapperArg wrapper(callback, arg); - MutexLock mu(Thread::Current(), *Locks::thread_list_lock_); - for (const auto& thread : list_) { - thread->VisitRoots(VerifyRootWrapperCallback, &wrapper); - } -} - uint32_t ThreadList::AllocThreadId(Thread* self) { MutexLock mu(self, *Locks::allocated_thread_ids_lock_); for (size_t i = 0; i < allocated_ids_.size(); ++i) { |