Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 751:20c6f43950b5
6490395: G1: Tidy up command line flags.
Summary: Change G1 flag names to be more consistent and disable some in 'product' mode.
Reviewed-by: tonyp, iveresov
author | johnc |
---|---|
date | Thu, 30 Apr 2009 15:07:53 -0700 |
parents | 2b6c55e36143 |
children | 29e7d79232b9 |
comparison
equal
deleted
inserted
replaced
748:51285b431bb2 | 751:20c6f43950b5 |
---|---|
158 while (next_obj < top) { | 158 while (next_obj < top) { |
159 // Keep filtering the remembered set. | 159 // Keep filtering the remembered set. |
160 if (!g1h->is_obj_dead(cur_oop, hr)) { | 160 if (!g1h->is_obj_dead(cur_oop, hr)) { |
161 // Bottom lies entirely below top, so we can call the | 161 // Bottom lies entirely below top, so we can call the |
162 // non-memRegion version of oop_iterate below. | 162 // non-memRegion version of oop_iterate below. |
163 #ifndef PRODUCT | |
164 if (G1VerifyMarkingInEvac) { | |
165 VerifyLiveClosure vl_cl(g1h); | |
166 cur_oop->oop_iterate(&vl_cl); | |
167 } | |
168 #endif | |
169 cur_oop->oop_iterate(cl); | 163 cur_oop->oop_iterate(cl); |
170 } | 164 } |
171 cur = next_obj; | 165 cur = next_obj; |
172 cur_oop = oop(cur); | 166 cur_oop = oop(cur); |
173 oop_size = cur_oop->size(); | 167 oop_size = cur_oop->size(); |
195 // Start filtering what we add to the remembered set. If the object is | 189 // Start filtering what we add to the remembered set. If the object is |
196 // not considered dead, either because it is marked (in the mark bitmap) | 190 // not considered dead, either because it is marked (in the mark bitmap) |
197 // or it was allocated after marking finished, then we add it. Otherwise | 191 // or it was allocated after marking finished, then we add it. Otherwise |
198 // we can safely ignore the object. | 192 // we can safely ignore the object. |
199 if (!g1h->is_obj_dead(oop(bottom), _hr)) { | 193 if (!g1h->is_obj_dead(oop(bottom), _hr)) { |
200 #ifndef PRODUCT | |
201 if (G1VerifyMarkingInEvac) { | |
202 VerifyLiveClosure vl_cl(g1h); | |
203 oop(bottom)->oop_iterate(&vl_cl, mr); | |
204 } | |
205 #endif | |
206 oop_size = oop(bottom)->oop_iterate(cl2, mr); | 194 oop_size = oop(bottom)->oop_iterate(cl2, mr); |
207 } else { | 195 } else { |
208 oop_size = oop(bottom)->size(); | 196 oop_size = oop(bottom)->size(); |
209 } | 197 } |
210 | 198 |
230 ShouldNotReachHere(); | 218 ShouldNotReachHere(); |
231 } | 219 } |
232 | 220 |
233 // Last object. Need to do dead-obj filtering here too. | 221 // Last object. Need to do dead-obj filtering here too. |
234 if (!g1h->is_obj_dead(oop(bottom), _hr)) { | 222 if (!g1h->is_obj_dead(oop(bottom), _hr)) { |
235 #ifndef PRODUCT | |
236 if (G1VerifyMarkingInEvac) { | |
237 VerifyLiveClosure vl_cl(g1h); | |
238 oop(bottom)->oop_iterate(&vl_cl, mr); | |
239 } | |
240 #endif | |
241 oop(bottom)->oop_iterate(cl2, mr); | 223 oop(bottom)->oop_iterate(cl2, mr); |
242 } | 224 } |
243 } | 225 } |
244 } | 226 } |
245 | 227 |
711 if (vl_cl.failures()) { | 693 if (vl_cl.failures()) { |
712 gclog_or_tty->print_cr("Heap:"); | 694 gclog_or_tty->print_cr("Heap:"); |
713 G1CollectedHeap::heap()->print(); | 695 G1CollectedHeap::heap()->print(); |
714 gclog_or_tty->print_cr(""); | 696 gclog_or_tty->print_cr(""); |
715 } | 697 } |
716 if (G1VerifyConcMark && | 698 if (VerifyDuringGC && |
717 G1VerifyConcMarkPrintReachable && | 699 G1VerifyConcMarkPrintReachable && |
718 vl_cl.failures()) { | 700 vl_cl.failures()) { |
719 g1->concurrent_mark()->print_prev_bitmap_reachable(); | 701 g1->concurrent_mark()->print_prev_bitmap_reachable(); |
720 } | 702 } |
721 guarantee(!vl_cl.failures(), "region verification failed"); | 703 guarantee(!vl_cl.failures(), "region verification failed"); |