Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 6011:f7a8920427a6
7145441: G1: collection set chooser-related cleanup
Summary: Cleanup of the CSet chooser class: standardize on uints for region num and indexes (instead of int, jint, etc.), make the method / field naming style more consistent, remove a lot of dead code.
Reviewed-by: johnc, brutisso
author | tonyp |
---|---|
date | Wed, 18 Apr 2012 13:39:55 -0400 |
parents | 720b6a76dd9d |
children | 8a2e5a6a19a4 |
comparison
equal
deleted
inserted
replaced
6010:720b6a76dd9d | 6011:f7a8920427a6 |
---|---|
4062 _evac_failure_scan_stack = NULL; | 4062 _evac_failure_scan_stack = NULL; |
4063 } | 4063 } |
4064 | 4064 |
4065 void G1CollectedHeap::remove_self_forwarding_pointers() { | 4065 void G1CollectedHeap::remove_self_forwarding_pointers() { |
4066 assert(check_cset_heap_region_claim_values(HeapRegion::InitialClaimValue), "sanity"); | 4066 assert(check_cset_heap_region_claim_values(HeapRegion::InitialClaimValue), "sanity"); |
4067 assert(g1_policy()->assertMarkedBytesDataOK(), "Should be!"); | |
4068 | 4067 |
4069 G1ParRemoveSelfForwardPtrsTask rsfp_task(this); | 4068 G1ParRemoveSelfForwardPtrsTask rsfp_task(this); |
4070 | 4069 |
4071 if (G1CollectedHeap::use_parallel_gc_threads()) { | 4070 if (G1CollectedHeap::use_parallel_gc_threads()) { |
4072 set_par_threads(); | 4071 set_par_threads(); |
4080 | 4079 |
4081 // Reset the claim values in the regions in the collection set. | 4080 // Reset the claim values in the regions in the collection set. |
4082 reset_cset_heap_region_claim_values(); | 4081 reset_cset_heap_region_claim_values(); |
4083 | 4082 |
4084 assert(check_cset_heap_region_claim_values(HeapRegion::InitialClaimValue), "sanity"); | 4083 assert(check_cset_heap_region_claim_values(HeapRegion::InitialClaimValue), "sanity"); |
4085 assert(g1_policy()->assertMarkedBytesDataOK(), "Should be!"); | |
4086 | 4084 |
4087 // Now restore saved marks, if any. | 4085 // Now restore saved marks, if any. |
4088 if (_objs_with_preserved_marks != NULL) { | 4086 if (_objs_with_preserved_marks != NULL) { |
4089 assert(_preserved_marks_of_objs != NULL, "Both or none."); | 4087 assert(_preserved_marks_of_objs != NULL, "Both or none."); |
4090 guarantee(_objs_with_preserved_marks->length() == | 4088 guarantee(_objs_with_preserved_marks->length() == |