diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-08 16:40:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-08 16:40:41 +0000 |
| commit | 8254783763226255a90c1ecf0a8e285501ba9df5 (patch) | |
| tree | a94f50ef1ac8758b4fdd6bfadd8d1653d6290269 /runtime/gc/collector/semi_space.cc | |
| parent | 13ff810b664549e321113099af9ed9242b31a36f (diff) | |
| parent | 78f7b4c04ab6e8b5581921bc95b67a9beee1c246 (diff) | |
| download | art-8254783763226255a90c1ecf0a8e285501ba9df5.zip art-8254783763226255a90c1ecf0a8e285501ba9df5.tar.gz art-8254783763226255a90c1ecf0a8e285501ba9df5.tar.bz2 | |
Merge "Add concurrent reference processing."
Diffstat (limited to 'runtime/gc/collector/semi_space.cc')
| -rw-r--r-- | runtime/gc/collector/semi_space.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc index a0659e7..a406f6d 100644 --- a/runtime/gc/collector/semi_space.cc +++ b/runtime/gc/collector/semi_space.cc @@ -30,6 +30,7 @@ #include "gc/accounting/remembered_set.h" #include "gc/accounting/space_bitmap-inl.h" #include "gc/heap.h" +#include "gc/reference_processor.h" #include "gc/space/bump_pointer_space.h" #include "gc/space/bump_pointer_space-inl.h" #include "gc/space/image_space.h" @@ -162,8 +163,9 @@ void SemiSpace::InitializePhase() { void SemiSpace::ProcessReferences(Thread* self) { TimingLogger::ScopedSplit split("ProcessReferences", &timings_); WriterMutexLock mu(self, *Locks::heap_bitmap_lock_); - GetHeap()->ProcessReferences(timings_, clear_soft_references_, &MarkedForwardingAddressCallback, - &MarkObjectCallback, &ProcessMarkStackCallback, this); + GetHeap()->GetReferenceProcessor()->ProcessReferences( + false, &timings_, clear_soft_references_, &MarkedForwardingAddressCallback, + &MarkObjectCallback, &ProcessMarkStackCallback, this); } void SemiSpace::MarkingPhase() { @@ -694,7 +696,8 @@ void SemiSpace::SweepLargeObjects(bool swap_bitmaps) { // Process the "referent" field in a java.lang.ref.Reference. If the referent has not yet been // marked, put it on the appropriate list in the heap for later processing. void SemiSpace::DelayReferenceReferent(mirror::Class* klass, mirror::Reference* reference) { - heap_->DelayReferenceReferent(klass, reference, MarkedForwardingAddressCallback, this); + heap_->GetReferenceProcessor()->DelayReferenceReferent(klass, reference, + MarkedForwardingAddressCallback, this); } class SemiSpaceMarkObjectVisitor { |