comparison src/share/vm/gc_implementation/g1/vmStructs_g1.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 58fc1b1523dc
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
55 nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t) \ 55 nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t) \
56 nonstatic_field(G1MonitoringSupport, _survivor_used, size_t) \ 56 nonstatic_field(G1MonitoringSupport, _survivor_used, size_t) \
57 nonstatic_field(G1MonitoringSupport, _old_committed, size_t) \ 57 nonstatic_field(G1MonitoringSupport, _old_committed, size_t) \
58 nonstatic_field(G1MonitoringSupport, _old_used, size_t) \ 58 nonstatic_field(G1MonitoringSupport, _old_used, size_t) \
59 \ 59 \
60 nonstatic_field(HeapRegionSetBase, _length, uint) \ 60 nonstatic_field(HeapRegionSetBase, _count, HeapRegionSetCount) \
61 nonstatic_field(HeapRegionSetBase, _region_num, uint) \ 61 \
62 nonstatic_field(HeapRegionSetBase, _total_used_bytes, size_t) \ 62 nonstatic_field(HeapRegionSetCount, _length, uint) \
63 nonstatic_field(HeapRegionSetCount, _capacity, size_t) \
63 64
64 65
65 #define VM_TYPES_G1(declare_type, declare_toplevel_type) \ 66 #define VM_TYPES_G1(declare_type, declare_toplevel_type) \
66 \ 67 \
67 declare_toplevel_type(G1HeapRegionTable) \ 68 declare_toplevel_type(G1HeapRegionTable) \
70 \ 71 \
71 declare_type(G1OffsetTableContigSpace, ContiguousSpace) \ 72 declare_type(G1OffsetTableContigSpace, ContiguousSpace) \
72 declare_type(HeapRegion, ContiguousSpace) \ 73 declare_type(HeapRegion, ContiguousSpace) \
73 declare_toplevel_type(HeapRegionSeq) \ 74 declare_toplevel_type(HeapRegionSeq) \
74 declare_toplevel_type(HeapRegionSetBase) \ 75 declare_toplevel_type(HeapRegionSetBase) \
76 declare_toplevel_type(HeapRegionSetCount) \
75 declare_toplevel_type(G1MonitoringSupport) \ 77 declare_toplevel_type(G1MonitoringSupport) \
76 \ 78 \
77 declare_toplevel_type(G1CollectedHeap*) \ 79 declare_toplevel_type(G1CollectedHeap*) \
78 declare_toplevel_type(HeapRegion*) \ 80 declare_toplevel_type(HeapRegion*) \
79 declare_toplevel_type(G1MonitoringSupport*) \ 81 declare_toplevel_type(G1MonitoringSupport*) \