diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:10 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:10 -0500 |
| commit | 3442967571bacf5fee6631ebb4eb268b8b610696 (patch) | |
| tree | e03cabead71b9f06da22d595453cc058bd373182 /runtime/gc/collector/sticky_mark_sweep.h | |
| parent | 773e16b98cb8ca2000eaeaf49f239f39ac51d562 (diff) | |
| parent | f9e3754e8a2f6244e037362c03db32d4244ecb2d (diff) | |
| download | art-3442967571bacf5fee6631ebb4eb268b8b610696.tar.gz art-3442967571bacf5fee6631ebb4eb268b8b610696.tar.bz2 art-3442967571bacf5fee6631ebb4eb268b8b610696.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:41 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'runtime/gc/collector/sticky_mark_sweep.h')
| -rw-r--r-- | runtime/gc/collector/sticky_mark_sweep.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/gc/collector/sticky_mark_sweep.h b/runtime/gc/collector/sticky_mark_sweep.h index abaf97845d..93b0b5fa79 100644 --- a/runtime/gc/collector/sticky_mark_sweep.h +++ b/runtime/gc/collector/sticky_mark_sweep.h @@ -33,6 +33,12 @@ class StickyMarkSweep FINAL : public PartialMarkSweep { StickyMarkSweep(Heap* heap, bool is_concurrent, const std::string& name_prefix = ""); ~StickyMarkSweep() {} + void MarkConcurrentRoots(VisitRootFlags flags) + OVERRIDE + REQUIRES(!mark_stack_lock_) + REQUIRES(Locks::heap_bitmap_lock_) + SHARED_REQUIRES(Locks::mutator_lock_); + protected: // Bind the live bits to the mark bits of bitmaps for all spaces, all spaces other than the // alloc space will be marked as immune. |