diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-02-13 18:02:13 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-18 10:45:12 -0800 |
| commit | 815873ecc312b1d231acce71e1a16f42cdaf09f2 (patch) | |
| tree | 18ba2fa951775e60b240271bfe975e6e2cfc654c /runtime/gc/collector/mark_sweep.h | |
| parent | 2befd09cf4fe89a18a655f3e1dd310831bfa769f (diff) | |
| download | art-815873ecc312b1d231acce71e1a16f42cdaf09f2.zip art-815873ecc312b1d231acce71e1a16f42cdaf09f2.tar.gz art-815873ecc312b1d231acce71e1a16f42cdaf09f2.tar.bz2 | |
Change root visitor to use Object**.
Simplifies code and improves the performance of root visiting since
we usually don't need to check to see if the object moved.
Change-Id: Iba998f5a15ae1fa1b53ca5226dd2168a411196cf
Diffstat (limited to 'runtime/gc/collector/mark_sweep.h')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index 8bc0bb5..6a48cf7 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -180,13 +180,18 @@ class MarkSweep : public GarbageCollector { SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); - static mirror::Object* MarkRootCallback(mirror::Object* root, void* arg, uint32_t thread_id, - RootType root_type) + static void MarkRootCallback(mirror::Object** root, void* arg, uint32_t thread_id, + RootType root_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); - static mirror::Object* MarkRootParallelCallback(mirror::Object* root, void* arg, - uint32_t thread_id, RootType root_type); + static mirror::Object* MarkObjectCallback(mirror::Object* object, void* arg) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); + + static void MarkRootParallelCallback(mirror::Object** root, void* arg, uint32_t thread_id, + RootType root_type) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Marks an object. void MarkObject(const mirror::Object* obj) |