comparison src/share/vm/gc_implementation/g1/vmStructs_g1.hpp @ 20377:a8ea2f110d87

8054819: Rename HeapRegionSeq to HeapRegionManager Reviewed-by: jwilhelm, jmasa
author tschatzl
date Tue, 26 Aug 2014 09:36:53 +0200
parents 6701abbc4441
children 227a9e5e4b4a
comparison
equal deleted inserted replaced
20359:4d3a43351904 20377:a8ea2f110d87
24 24
25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
26 #define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP 26 #define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
27 27
28 #include "gc_implementation/g1/heapRegion.hpp" 28 #include "gc_implementation/g1/heapRegion.hpp"
29 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" 29 #include "gc_implementation/g1/heapRegionManager.inline.hpp"
30 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 30 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
31 31
32 #define VM_STRUCTS_G1(nonstatic_field, static_field) \ 32 #define VM_STRUCTS_G1(nonstatic_field, static_field) \
33 \ 33 \
34 static_field(HeapRegion, GrainBytes, size_t) \ 34 static_field(HeapRegion, GrainBytes, size_t) \
40 nonstatic_field(G1HeapRegionTable, _length, size_t) \ 40 nonstatic_field(G1HeapRegionTable, _length, size_t) \
41 nonstatic_field(G1HeapRegionTable, _biased_base, address) \ 41 nonstatic_field(G1HeapRegionTable, _biased_base, address) \
42 nonstatic_field(G1HeapRegionTable, _bias, size_t) \ 42 nonstatic_field(G1HeapRegionTable, _bias, size_t) \
43 nonstatic_field(G1HeapRegionTable, _shift_by, uint) \ 43 nonstatic_field(G1HeapRegionTable, _shift_by, uint) \
44 \ 44 \
45 nonstatic_field(HeapRegionSeq, _regions, G1HeapRegionTable) \ 45 nonstatic_field(HeapRegionManager, _regions, G1HeapRegionTable) \
46 nonstatic_field(HeapRegionSeq, _num_committed, uint) \ 46 nonstatic_field(HeapRegionManager, _num_committed, uint) \
47 \ 47 \
48 nonstatic_field(G1CollectedHeap, _hrs, HeapRegionSeq) \ 48 nonstatic_field(G1CollectedHeap, _hrm, HeapRegionManager) \
49 nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \ 49 nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \
50 nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \ 50 nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \
51 nonstatic_field(G1CollectedHeap, _old_set, HeapRegionSetBase) \ 51 nonstatic_field(G1CollectedHeap, _old_set, HeapRegionSetBase) \
52 nonstatic_field(G1CollectedHeap, _humongous_set, HeapRegionSetBase) \ 52 nonstatic_field(G1CollectedHeap, _humongous_set, HeapRegionSetBase) \
53 \ 53 \
70 \ 70 \
71 declare_type(G1CollectedHeap, SharedHeap) \ 71 declare_type(G1CollectedHeap, SharedHeap) \
72 \ 72 \
73 declare_type(G1OffsetTableContigSpace, CompactibleSpace) \ 73 declare_type(G1OffsetTableContigSpace, CompactibleSpace) \
74 declare_type(HeapRegion, G1OffsetTableContigSpace) \ 74 declare_type(HeapRegion, G1OffsetTableContigSpace) \
75 declare_toplevel_type(HeapRegionSeq) \ 75 declare_toplevel_type(HeapRegionManager) \
76 declare_toplevel_type(HeapRegionSetBase) \ 76 declare_toplevel_type(HeapRegionSetBase) \
77 declare_toplevel_type(HeapRegionSetCount) \ 77 declare_toplevel_type(HeapRegionSetCount) \
78 declare_toplevel_type(G1MonitoringSupport) \ 78 declare_toplevel_type(G1MonitoringSupport) \
79 \ 79 \
80 declare_toplevel_type(G1CollectedHeap*) \ 80 declare_toplevel_type(G1CollectedHeap*) \