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

rev 57716 : [mq]: remove_cbl_mon

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 34,44 ****
  #include "logging/log.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
- #include "runtime/mutexLocker.hpp"
  #include "runtime/orderAccess.hpp"
  #include "runtime/thread.inline.hpp"
  #include "utilities/macros.hpp"
  #ifdef COMPILER1
  #include "gc/g1/c1/g1BarrierSetC1.hpp"
--- 34,43 ----
*** 57,67 ****
                        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.
--- 56,66 ----
                        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(&_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.