src/hotspot/share/gc/g1/g1ThreadLocalData.hpp

rev 53581 : [mq]: move_files
rev 53582 : imported patch rename

*** 1,7 ****
  /*
!  * Copyright (c) 2018, 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) 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.
*** 22,42 ****
   */
  
  #ifndef SHARE_GC_G1_G1THREADLOCALDATA_HPP
  #define SHARE_GC_G1_G1THREADLOCALDATA_HPP
  
- #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/shared/satbMarkQueue.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/sizes.hpp"
  
  class G1ThreadLocalData {
  private:
    SATBMarkQueue  _satb_mark_queue;
!   DirtyCardQueue _dirty_card_queue;
  
    G1ThreadLocalData() :
        _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()),
        _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set()) {}
  
--- 22,42 ----
   */
  
  #ifndef SHARE_GC_G1_G1THREADLOCALDATA_HPP
  #define SHARE_GC_G1_G1THREADLOCALDATA_HPP
  
  #include "gc/g1/g1BarrierSet.hpp"
+ #include "gc/g1/g1DirtyCardQueue.hpp"
  #include "gc/shared/satbMarkQueue.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/sizes.hpp"
  
  class G1ThreadLocalData {
  private:
    SATBMarkQueue _satb_mark_queue;
!   G1DirtyCardQueue _dirty_card_queue;
  
    G1ThreadLocalData() :
        _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()),
        _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set()) {}
  
*** 64,74 ****
  
    static SATBMarkQueue& satb_mark_queue(Thread* thread) {
      return data(thread)->_satb_mark_queue;
    }
  
!   static DirtyCardQueue& dirty_card_queue(Thread* thread) {
      return data(thread)->_dirty_card_queue;
    }
  
    static ByteSize satb_mark_queue_active_offset() {
      return satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_active();
--- 64,74 ----
  
    static SATBMarkQueue& satb_mark_queue(Thread* thread) {
      return data(thread)->_satb_mark_queue;
    }
  
!   static G1DirtyCardQueue& dirty_card_queue(Thread* thread) {
      return data(thread)->_dirty_card_queue;
    }
  
    static ByteSize satb_mark_queue_active_offset() {
      return satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_active();
*** 81,94 ****
    static ByteSize satb_mark_queue_buffer_offset() {
      return satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_buf();
    }
  
    static ByteSize dirty_card_queue_index_offset() {
!     return dirty_card_queue_offset() + DirtyCardQueue::byte_offset_of_index();
    }
  
    static ByteSize dirty_card_queue_buffer_offset() {
!     return dirty_card_queue_offset() + DirtyCardQueue::byte_offset_of_buf();
    }
  };
  
  #endif // SHARE_GC_G1_G1THREADLOCALDATA_HPP
--- 81,94 ----
    static ByteSize satb_mark_queue_buffer_offset() {
      return satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_buf();
    }
  
    static ByteSize dirty_card_queue_index_offset() {
!     return dirty_card_queue_offset() + G1DirtyCardQueue::byte_offset_of_index();
    }
  
    static ByteSize dirty_card_queue_buffer_offset() {
!     return dirty_card_queue_offset() + G1DirtyCardQueue::byte_offset_of_buf();
    }
  };
  
  #endif // SHARE_GC_G1_G1THREADLOCALDATA_HPP