src/hotspot/share/gc/g1/g1BarrierSet.cpp

rev 56193 : [mq]: pqsinit

*** 55,66 ****
                        make_barrier_set_c2<G1BarrierSetC2>(),
                        card_table,
                        BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
    _satb_mark_queue_buffer_allocator("SATB Buffer Allocator", G1SATBBufferSize),
    _dirty_card_queue_buffer_allocator("DC Buffer Allocator", G1UpdateBufferSize),
!   _satb_mark_queue_set(),
!   _dirty_card_queue_set(),
    _shared_dirty_card_queue(&_dirty_card_queue_set)
  {}
  
  void G1BarrierSet::enqueue(oop pre_val) {
    // Nulls should have been already filtered.
--- 55,66 ----
                        make_barrier_set_c2<G1BarrierSetC2>(),
                        card_table,
                        BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
    _satb_mark_queue_buffer_allocator("SATB Buffer Allocator", G1SATBBufferSize),
    _dirty_card_queue_buffer_allocator("DC Buffer Allocator", G1UpdateBufferSize),
!   _satb_mark_queue_set(&_satb_mark_queue_buffer_allocator),
!   _dirty_card_queue_set(DirtyCardQ_CBL_mon, &_dirty_card_queue_buffer_allocator),
    _shared_dirty_card_queue(&_dirty_card_queue_set)
  {}
  
  void G1BarrierSet::enqueue(oop pre_val) {
    // Nulls should have been already filtered.
*** 157,169 ****
    // Flush any deferred card marks.
    CardTableBarrierSet::on_thread_detach(thread);
    G1ThreadLocalData::satb_mark_queue(thread).flush();
    G1ThreadLocalData::dirty_card_queue(thread).flush();
  }
- 
- BufferNode::Allocator& G1BarrierSet::satb_mark_queue_buffer_allocator() {
-   return _satb_mark_queue_buffer_allocator;
- }
- 
- BufferNode::Allocator& G1BarrierSet::dirty_card_queue_buffer_allocator() {
-   return _dirty_card_queue_buffer_allocator;
- }
--- 157,161 ----