src/share/vm/gc_implementation/g1/vmStructs_g1.hpp

rev 7902 : [mq]: 8073052-Rename-and-clean-up-the-allocation-manager-hierarchy-in-g1Allocator

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2013, 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) 2011, 2015, 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.
*** 43,59 ****
    nonstatic_field(G1HeapRegionTable, _shift_by,         uint)                 \
                                                                                \
    nonstatic_field(HeapRegionManager, _regions,          G1HeapRegionTable)    \
    nonstatic_field(HeapRegionManager, _num_committed,    uint)                 \
                                                                                \
!   nonstatic_field(G1Allocator,     _summary_bytes_used, size_t)               \
                                                                                \
    nonstatic_field(G1CollectedHeap, _hrm,                HeapRegionManager)    \
    nonstatic_field(G1CollectedHeap, _g1mm,               G1MonitoringSupport*) \
    nonstatic_field(G1CollectedHeap, _old_set,            HeapRegionSetBase)    \
    nonstatic_field(G1CollectedHeap, _humongous_set,      HeapRegionSetBase)    \
!   nonstatic_field(G1CollectedHeap, _allocator,          G1Allocator*)         \
                                                                                \
    nonstatic_field(G1MonitoringSupport, _eden_committed,     size_t)           \
    nonstatic_field(G1MonitoringSupport, _eden_used,          size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_used,      size_t)           \
--- 43,59 ----
    nonstatic_field(G1HeapRegionTable, _shift_by,         uint)                 \
                                                                                \
    nonstatic_field(HeapRegionManager, _regions,          G1HeapRegionTable)    \
    nonstatic_field(HeapRegionManager, _num_committed,    uint)                 \
                                                                                \
!   nonstatic_field(AllocRegionManager, _summary_bytes_used, size_t)            \
                                                                                \
    nonstatic_field(G1CollectedHeap, _hrm,                HeapRegionManager)    \
    nonstatic_field(G1CollectedHeap, _g1mm,               G1MonitoringSupport*) \
    nonstatic_field(G1CollectedHeap, _old_set,            HeapRegionSetBase)    \
    nonstatic_field(G1CollectedHeap, _humongous_set,      HeapRegionSetBase)    \
!   nonstatic_field(G1CollectedHeap, _allocator,          AllocRegionManager*)  \
                                                                                \
    nonstatic_field(G1MonitoringSupport, _eden_committed,     size_t)           \
    nonstatic_field(G1MonitoringSupport, _eden_used,          size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t)           \
    nonstatic_field(G1MonitoringSupport, _survivor_used,      size_t)           \
*** 76,89 ****
    declare_type(HeapRegion, G1OffsetTableContigSpace)                          \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(HeapRegionSetCount)                                   \
    declare_toplevel_type(G1MonitoringSupport)                                  \
!   declare_toplevel_type(G1Allocator)                                          \
                                                                                \
    declare_toplevel_type(G1CollectedHeap*)                                     \
    declare_toplevel_type(HeapRegion*)                                          \
    declare_toplevel_type(G1MonitoringSupport*)                                 \
!   declare_toplevel_type(G1Allocator*)                                         \
  
  
  #endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
--- 76,89 ----
    declare_type(HeapRegion, G1OffsetTableContigSpace)                          \
    declare_toplevel_type(HeapRegionManager)                                    \
    declare_toplevel_type(HeapRegionSetBase)                                    \
    declare_toplevel_type(HeapRegionSetCount)                                   \
    declare_toplevel_type(G1MonitoringSupport)                                  \
!   declare_toplevel_type(AllocRegionManager)                                   \
                                                                                \
    declare_toplevel_type(G1CollectedHeap*)                                     \
    declare_toplevel_type(HeapRegion*)                                          \
    declare_toplevel_type(G1MonitoringSupport*)                                 \
!   declare_toplevel_type(AllocRegionManager*)                                  \
  
  
  #endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP