diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-01-28 14:50:23 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-11 10:40:10 -0800 |
| commit | 83c8ee000d525017ead8753fce6bc1020249b96a (patch) | |
| tree | d5167ed15dee2629905ac3640b6ea0578d4ae312 /runtime/gc/collector/mark_sweep.cc | |
| parent | 7cba217ab0661d74deccbb97160cdf60b74d4ea3 (diff) | |
| download | art-83c8ee000d525017ead8753fce6bc1020249b96a.zip art-83c8ee000d525017ead8753fce6bc1020249b96a.tar.gz art-83c8ee000d525017ead8753fce6bc1020249b96a.tar.bz2 | |
Add root types and thread id to root visiting.
Enables us to pass the root type and thread id to hprof.
Bug: 12680863
Change-Id: I6a0f1f9e3aa8f9b4033d695818ae7ca3460d67cb
Diffstat (limited to 'runtime/gc/collector/mark_sweep.cc')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index 862d06f..de9f59e 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -525,14 +525,16 @@ void MarkSweep::MarkRoot(const Object* obj) { } } -Object* MarkSweep::MarkRootParallelCallback(Object* root, void* arg) { +mirror::Object* MarkSweep::MarkRootParallelCallback(mirror::Object* root, void* arg, + uint32_t /*thread_id*/, RootType /*root_type*/) { DCHECK(root != NULL); DCHECK(arg != NULL); reinterpret_cast<MarkSweep*>(arg)->MarkObjectNonNullParallel(root); return root; } -Object* MarkSweep::MarkRootCallback(Object* root, void* arg) { +Object* MarkSweep::MarkRootCallback(Object* root, void* arg, uint32_t /*thread_id*/, + RootType /*root_type*/) { DCHECK(root != nullptr); DCHECK(arg != nullptr); reinterpret_cast<MarkSweep*>(arg)->MarkObjectNonNull(root); @@ -930,7 +932,7 @@ void MarkSweep::RecursiveMark() { ProcessMarkStack(false); } -mirror::Object* MarkSweep::IsMarkedCallback(Object* object, void* arg) { +mirror::Object* MarkSweep::IsMarkedCallback(mirror::Object* object, void* arg) { if (reinterpret_cast<MarkSweep*>(arg)->IsMarked(object)) { return object; } |