< prev index next >

src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp

Print this page
@@ -56,10 +56,14 @@
  
  template <class T, StringDedupMode STRING_DEDUP>
  void ShenandoahMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, StringDedup::Requests* const req, ShenandoahMarkTask* task) {
    oop obj = task->obj();
  
+   // TODO: This will push array chunks into the mark queue with no regard for
+   // generations. I don't think it will break anything, but the young generation
+   // scan might end up processing some old generation array chunks.
+ 
    shenandoah_assert_not_forwarded(NULL, obj);
    shenandoah_assert_marked(NULL, obj);
    shenandoah_assert_not_in_cset_except(NULL, obj, ShenandoahHeap::heap()->cancelled_gc());
  
    // Are we in weak subgraph scan?

@@ -100,10 +104,11 @@
    ShenandoahHeapRegion* region = heap->get_region(region_idx);
    size_t size = obj->size();
  
    if (!region->is_humongous_start()) {
      assert(!region->is_humongous(), "Cannot have continuations here");
+     assert(region->affiliation() != FREE, "Do not count live data within Free Regular Region " SIZE_FORMAT, region_idx);
      ShenandoahLiveData cur = live_data[region_idx];
      size_t new_val = size + cur;
      if (new_val >= SHENANDOAH_LIVEDATA_MAX) {
        // overflow, flush to region data
        region->increase_live_data_gc_words(new_val);

@@ -114,13 +119,15 @@
      }
    } else {
      shenandoah_assert_in_correct_region(NULL, obj);
      size_t num_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
  
+     assert(region->affiliation() != FREE, "Do not count live data within FREE Humongous Start Region " SIZE_FORMAT, region_idx);
      for (size_t i = region_idx; i < region_idx + num_regions; i++) {
        ShenandoahHeapRegion* chain_reg = heap->get_region(i);
        assert(chain_reg->is_humongous(), "Expecting a humongous region");
+       assert(chain_reg->affiliation() != FREE, "Do not count live data within FREE Humongous Continuation Region " SIZE_FORMAT, i);
        chain_reg->increase_live_data_gc_words(chain_reg->used() >> LogHeapWordSize);
      }
    }
  }
  

@@ -219,60 +226,115 @@
  #endif
  
    array->oop_iterate_range(cl, from, to);
  }
  
+ template <GenerationMode GENERATION>
  class ShenandoahSATBBufferClosure : public SATBBufferClosure {
  private:
    ShenandoahObjToScanQueue* _queue;
+   ShenandoahObjToScanQueue* _old;
    ShenandoahHeap* _heap;
    ShenandoahMarkingContext* const _mark_context;
  public:
-   ShenandoahSATBBufferClosure(ShenandoahObjToScanQueue* q) :
+   ShenandoahSATBBufferClosure(ShenandoahObjToScanQueue* q, ShenandoahObjToScanQueue* old) :
      _queue(q),
+     _old(old),
      _heap(ShenandoahHeap::heap()),
      _mark_context(_heap->marking_context())
    {
    }
  
    void do_buffer(void **buffer, size_t size) {
-     assert(size == 0 || !_heap->has_forwarded_objects(), "Forwarded objects are not expected here");
+     assert(size == 0 || !_heap->has_forwarded_objects() || _heap->is_concurrent_old_mark_in_progress(), "Forwarded objects are not expected here");
      for (size_t i = 0; i < size; ++i) {
        oop *p = (oop *) &buffer[i];
-       ShenandoahMark::mark_through_ref<oop>(p, _queue, _mark_context, false);
+       ShenandoahMark::mark_through_ref<oop, GENERATION>(p, _queue, _old, _mark_context, false);
      }
    }
  };
  
- template<class T>
- inline void ShenandoahMark::mark_through_ref(T* p, ShenandoahObjToScanQueue* q, ShenandoahMarkingContext* const mark_context, bool weak) {
+ template<GenerationMode GENERATION>
+ bool ShenandoahMark::in_generation(oop obj) {
+   // Each in-line expansion of in_generation() resolves GENERATION at compile time.
+   if (GENERATION == YOUNG)
+     return ShenandoahHeap::heap()->is_in_young(obj);
+   else if (GENERATION == OLD)
+     return ShenandoahHeap::heap()->is_in_old(obj);
+   else if (GENERATION == GLOBAL)
+     return true;
+   else
+     return false;
+ }
+ 
+ template<class T, GenerationMode GENERATION>
+ inline void ShenandoahMark::mark_through_ref(T *p, ShenandoahObjToScanQueue* q, ShenandoahObjToScanQueue* old, ShenandoahMarkingContext* const mark_context, bool weak) {
    T o = RawAccess<>::oop_load(p);
    if (!CompressedOops::is_null(o)) {
      oop obj = CompressedOops::decode_not_null(o);
  
+     ShenandoahHeap* heap = ShenandoahHeap::heap();
      shenandoah_assert_not_forwarded(p, obj);
-     shenandoah_assert_not_in_cset_except(p, obj, ShenandoahHeap::heap()->cancelled_gc());
- 
-     bool skip_live = false;
-     bool marked;
-     if (weak) {
-       marked = mark_context->mark_weak(obj);
-     } else {
-       marked = mark_context->mark_strong(obj, /* was_upgraded = */ skip_live);
-     }
-     if (marked) {
-       bool pushed = q->push(ShenandoahMarkTask(obj, skip_live, weak));
-       assert(pushed, "overflow queue should always succeed pushing");
+     shenandoah_assert_not_in_cset_except(p, obj, heap->cancelled_gc());
+     if (in_generation<GENERATION>(obj)) {
+       mark_ref(q, mark_context, weak, obj);
+       shenandoah_assert_marked(p, obj);
+       if (heap->mode()->is_generational()) {
+         // TODO: As implemented herein, GLOBAL collections reconstruct the card table during GLOBAL concurrent
+         // marking. Note that the card table is cleaned at init_mark time so it needs to be reconstructed to support
+         // future young-gen collections.  It might be better to reconstruct card table in
+         // ShenandoahHeapRegion::global_oop_iterate_and_fill_dead.  We could either mark all live memory as dirty, or could
+         // use the GLOBAL update-refs scanning of pointers to determine precisely which cards to flag as dirty.
+         if (GENERATION == YOUNG && heap->is_in_old(p)) {
+           // Mark card as dirty because remembered set scanning still finds interesting pointer.
+           heap->mark_card_as_dirty((HeapWord*)p);
+         } else if (GENERATION == GLOBAL && heap->is_in_old(p) && heap->is_in_young(obj)) {
+           // Mark card as dirty because GLOBAL marking finds interesting pointer.
+           heap->mark_card_as_dirty((HeapWord*)p);
+         }
+       }
+     } else if (old != nullptr) {
+       // Young mark, bootstrapping old or concurrent with old marking.
+       mark_ref(old, mark_context, weak, obj);
+       shenandoah_assert_marked(p, obj);
+     } else if (GENERATION == OLD) {
+       // Old mark, found a young pointer.
+       // TODO:  Rethink this: may be redundant with dirtying of cards identified during young-gen remembered set scanning
+       // and by mutator write barriers.  Assert
+       assert(heap->is_in_young(obj), "Expected young object.");
+       heap->mark_card_as_dirty(p);
      }
+   }
+ }
  
-     shenandoah_assert_marked(p, obj);
+ inline void ShenandoahMark::mark_ref(ShenandoahObjToScanQueue* q,
+                               ShenandoahMarkingContext* const mark_context,
+                               bool weak, oop obj) {
+   bool skip_live = false;
+   bool marked;
+   if (weak) {
+     marked = mark_context->mark_weak(obj);
+   } else {
+     marked = mark_context->mark_strong(obj, /* was_upgraded = */ skip_live);
+   }
+   if (marked) {
+     bool pushed = q->push(ShenandoahMarkTask(obj, skip_live, weak));
+     assert(pushed, "overflow queue should always succeed pushing");
    }
  }
  
  ShenandoahObjToScanQueueSet* ShenandoahMark::task_queues() const {
    return _task_queues;
  }
  
  ShenandoahObjToScanQueue* ShenandoahMark::get_queue(uint index) const {
    return _task_queues->queue(index);
  }
+ 
+ ShenandoahObjToScanQueue* ShenandoahMark::get_old_queue(uint index) const {
+   if (_old_gen_task_queues != nullptr) {
+     return _old_gen_task_queues->queue(index);
+   }
+   return nullptr;
+ }
+ 
  #endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARK_INLINE_HPP
< prev index next >