Print this page
rev 2896 : 6484965: G1: piggy-back liveness accounting phase on marking
Summary: Remove the separate counting phase of concurrent marking by tracking the amount of marked bytes and the cards spanned by marked objects in marking task/worker thread local data structures, which are updated as individual objects are marked.
Reviewed-by: brutisso
Split |
Close |
Expand all |
Collapse all |
--- old/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ new/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
1 1 /*
2 2 * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
26 26 #define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
27 27
28 28 class HeapRegion;
29 29 class G1CollectedHeap;
30 30 class G1RemSet;
31 31 class ConcurrentMark;
32 32 class DirtyCardToOopClosure;
33 33 class CMBitMap;
34 34 class CMMarkStack;
35 35 class G1ParScanThreadState;
36 36 class CMTask;
37 37 class ReferenceProcessor;
38 38
39 39 // A class that scans oops in a given heap region (much as OopsInGenClosure
40 40 // scans oops in a generation.)
41 41 class OopsInHeapRegionClosure: public OopsInGenClosure {
42 42 protected:
43 43 HeapRegion* _from;
↓ open down ↓ |
43 lines elided |
↑ open up ↑ |
44 44 public:
45 45 void set_region(HeapRegion* from) { _from = from; }
46 46 };
47 47
48 48 class G1ParClosureSuper : public OopsInHeapRegionClosure {
49 49 protected:
50 50 G1CollectedHeap* _g1;
51 51 G1RemSet* _g1_rem;
52 52 ConcurrentMark* _cm;
53 53 G1ParScanThreadState* _par_scan_state;
54 + int _worker_i;
54 55 bool _during_initial_mark;
55 56 bool _mark_in_progress;
56 57 public:
57 58 G1ParClosureSuper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state);
58 59 bool apply_to_weak_ref_discovered_field() { return true; }
59 60 };
60 61
61 62 class G1ParPushHeapRSClosure : public G1ParClosureSuper {
62 63 public:
63 64 G1ParPushHeapRSClosure(G1CollectedHeap* g1,
64 65 G1ParScanThreadState* par_scan_state):
65 66 G1ParClosureSuper(g1, par_scan_state) { }
66 67
67 68 template <class T> void do_oop_nv(T* p);
68 69 virtual void do_oop(oop* p) { do_oop_nv(p); }
69 70 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
70 71 };
71 72
72 73 class G1ParScanClosure : public G1ParClosureSuper {
73 74 public:
74 75 G1ParScanClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state, ReferenceProcessor* rp) :
75 76 G1ParClosureSuper(g1, par_scan_state)
76 77 {
77 78 assert(_ref_processor == NULL, "sanity");
78 79 _ref_processor = rp;
79 80 }
80 81
81 82 template <class T> void do_oop_nv(T* p);
82 83 virtual void do_oop(oop* p) { do_oop_nv(p); }
83 84 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
84 85 };
85 86
86 87 #define G1_PARTIAL_ARRAY_MASK 0x2
87 88
88 89 template <class T> inline bool has_partial_array_mask(T* ref) {
89 90 return ((uintptr_t)ref & G1_PARTIAL_ARRAY_MASK) == G1_PARTIAL_ARRAY_MASK;
90 91 }
91 92
92 93 template <class T> inline T* set_partial_array_mask(T obj) {
93 94 assert(((uintptr_t)obj & G1_PARTIAL_ARRAY_MASK) == 0, "Information loss!");
94 95 return (T*) ((uintptr_t)obj | G1_PARTIAL_ARRAY_MASK);
95 96 }
96 97
97 98 template <class T> inline oop clear_partial_array_mask(T* ref) {
98 99 return oop((intptr_t)ref & ~G1_PARTIAL_ARRAY_MASK);
99 100 }
100 101
101 102 class G1ParScanPartialArrayClosure : public G1ParClosureSuper {
102 103 G1ParScanClosure _scanner;
103 104
104 105 public:
105 106 G1ParScanPartialArrayClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state, ReferenceProcessor* rp) :
106 107 G1ParClosureSuper(g1, par_scan_state), _scanner(g1, par_scan_state, rp)
107 108 {
108 109 assert(_ref_processor == NULL, "sanity");
109 110 }
110 111
111 112 G1ParScanClosure* scanner() {
112 113 return &_scanner;
113 114 }
114 115
115 116 template <class T> void do_oop_nv(T* p);
116 117 virtual void do_oop(oop* p) { do_oop_nv(p); }
117 118 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
118 119 };
119 120
120 121
121 122 class G1ParCopyHelper : public G1ParClosureSuper {
122 123 G1ParScanClosure *_scanner;
123 124 protected:
124 125 template <class T> void mark_object(T* p);
125 126 oop copy_to_survivor_space(oop obj, bool should_mark_root,
126 127 bool should_mark_copy);
127 128 public:
128 129 G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
129 130 G1ParScanClosure *scanner) :
130 131 G1ParClosureSuper(g1, par_scan_state), _scanner(scanner) { }
131 132 };
132 133
133 134 template<bool do_gen_barrier, G1Barrier barrier,
134 135 bool do_mark_object>
135 136 class G1ParCopyClosure : public G1ParCopyHelper {
136 137 G1ParScanClosure _scanner;
137 138
138 139 template <class T> void do_oop_work(T* p);
139 140
140 141 public:
141 142 G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
142 143 ReferenceProcessor* rp) :
143 144 _scanner(g1, par_scan_state, rp),
144 145 G1ParCopyHelper(g1, par_scan_state, &_scanner)
145 146 {
146 147 assert(_ref_processor == NULL, "sanity");
147 148 }
148 149
149 150 G1ParScanClosure* scanner() { return &_scanner; }
150 151
151 152 template <class T> void do_oop_nv(T* p) {
152 153 do_oop_work(p);
153 154 }
154 155 virtual void do_oop(oop* p) { do_oop_nv(p); }
155 156 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
156 157 };
157 158
158 159 typedef G1ParCopyClosure<false, G1BarrierNone, false> G1ParScanExtRootClosure;
159 160 typedef G1ParCopyClosure<true, G1BarrierNone, false> G1ParScanPermClosure;
160 161
161 162 typedef G1ParCopyClosure<false, G1BarrierNone, true> G1ParScanAndMarkExtRootClosure;
162 163 typedef G1ParCopyClosure<true, G1BarrierNone, true> G1ParScanAndMarkPermClosure;
163 164
164 165 // The following closure types are no longer used but are retained
165 166 // for historical reasons:
166 167 // typedef G1ParCopyClosure<false, G1BarrierRS, false> G1ParScanHeapRSClosure;
167 168 // typedef G1ParCopyClosure<false, G1BarrierRS, true> G1ParScanAndMarkHeapRSClosure;
168 169
169 170 // The following closure type is defined in g1_specialized_oop_closures.hpp:
170 171 //
171 172 // typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacClosure;
172 173
173 174 // We use a separate closure to handle references during evacuation
174 175 // failure processing.
175 176 // We could have used another instance of G1ParScanHeapEvacClosure
176 177 // (since that closure no longer assumes that the references it
177 178 // handles point into the collection set).
178 179
179 180 typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacFailureClosure;
180 181
181 182 class FilterIntoCSClosure: public OopClosure {
182 183 G1CollectedHeap* _g1;
183 184 OopClosure* _oc;
184 185 DirtyCardToOopClosure* _dcto_cl;
185 186 public:
186 187 FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl,
187 188 G1CollectedHeap* g1,
188 189 OopClosure* oc) :
189 190 _dcto_cl(dcto_cl), _g1(g1), _oc(oc) { }
190 191
191 192 template <class T> void do_oop_nv(T* p);
192 193 virtual void do_oop(oop* p) { do_oop_nv(p); }
193 194 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
194 195 bool apply_to_weak_ref_discovered_field() { return true; }
195 196 bool do_header() { return false; }
196 197 };
197 198
198 199 class FilterOutOfRegionClosure: public OopClosure {
199 200 HeapWord* _r_bottom;
200 201 HeapWord* _r_end;
201 202 OopClosure* _oc;
202 203 int _out_of_region;
203 204 public:
204 205 FilterOutOfRegionClosure(HeapRegion* r, OopClosure* oc);
205 206 template <class T> void do_oop_nv(T* p);
206 207 virtual void do_oop(oop* p) { do_oop_nv(p); }
207 208 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
208 209 bool apply_to_weak_ref_discovered_field() { return true; }
209 210 bool do_header() { return false; }
210 211 int out_of_region() { return _out_of_region; }
211 212 };
212 213
213 214 // Closure for iterating over object fields during concurrent marking
214 215 class G1CMOopClosure : public OopClosure {
215 216 G1CollectedHeap* _g1h;
216 217 ConcurrentMark* _cm;
217 218 CMTask* _task;
218 219 public:
219 220 G1CMOopClosure(G1CollectedHeap* g1h, ConcurrentMark* cm, CMTask* task);
220 221 template <class T> void do_oop_nv(T* p);
221 222 virtual void do_oop( oop* p) { do_oop_nv(p); }
222 223 virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
223 224 };
224 225
225 226 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
↓ open down ↓ |
162 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX